Skip to content

Commit

Permalink
Revert #1825 because of unit test failures
Browse files Browse the repository at this point in the history
Unfixes brave/brave-browser#2566

This reverts commit eba28d0, reversing
changes made to 94401f9.
  • Loading branch information
bsclifton committed Apr 9, 2019
1 parent 3f8b23c commit 3da1c0b
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 118 deletions.
2 changes: 0 additions & 2 deletions browser/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ source_set("ui") {
"views/brave_actions/brave_action_view.h",
"views/brave_actions/brave_actions_container.cc",
"views/brave_actions/brave_actions_container.h",
"views/brave_status_bubble_views.cc",
"views/brave_status_bubble_views.h",
"views/download/brave_download_item_view.cc",
"views/download/brave_download_item_view.h",
"views/frame/brave_browser_view.cc",
Expand Down
20 changes: 0 additions & 20 deletions browser/ui/views/brave_status_bubble_views.cc

This file was deleted.

23 changes: 0 additions & 23 deletions browser/ui/views/brave_status_bubble_views.h

This file was deleted.

50 changes: 0 additions & 50 deletions browser/ui/views/brave_status_bubble_views_unittest.cc

This file was deleted.

9 changes: 1 addition & 8 deletions chromium_src/chrome/browser/ui/views/frame/browser_view.cc
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "brave/browser/ui/views/brave_status_bubble_views.h"
#include "brave/browser/ui/views/toolbar/brave_toolbar_view.h"

#define ToolbarView BraveToolbarView
#define StatusBubbleViews BraveStatusBubbleViews

#include "../../../../../../../chrome/browser/ui/views/frame/browser_view.cc" // NOLINT
#include "../../../../../../../chrome/browser/ui/views/frame/browser_view.cc"
14 changes: 0 additions & 14 deletions patches/chrome-browser-ui-views-status_bubble_views.h.patch

This file was deleted.

1 change: 0 additions & 1 deletion test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ test("brave_unit_tests") {
"//brave/browser/brave_resources_util_unittest.cc",
"//brave/browser/brave_stats_updater_unittest.cc",
"//brave/browser/download/brave_download_item_model_unittest.cc",
"//brave/browser/ui/views/brave_status_bubble_views_unittest.cc",
"//brave/browser/tor/mock_tor_profile_service_impl.cc",
"//brave/browser/tor/mock_tor_profile_service_impl.h",
"//brave/browser/tor/mock_tor_profile_service_factory.cc",
Expand Down

0 comments on commit 3da1c0b

Please sign in to comment.