Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2421)

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_action_view.h

Issue 1492423003: Rejigger ThemeService: move exposure of ThemeProvider interface to a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: respond to comments Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/toolbar/toolbar_action_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.h b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
index 7df2efe3d819d95b4dc4cd2831a9ac023594da46..9034110f806c4a0c6d18d993c1bea57f5e5fe208 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
@@ -7,8 +7,6 @@
#include "base/callback.h"
#include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
#include "ui/views/animation/ink_drop_host.h"
#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/menu_button.h"
@@ -40,7 +38,6 @@ class ToolbarActionView : public views::MenuButton,
public ToolbarActionViewDelegateViews,
public views::MenuButtonListener,
public views::ContextMenuController,
- public content::NotificationObserver,
public views::InkDropHost {
public:
// Need DragController here because ToolbarActionView could be
@@ -89,11 +86,6 @@ class ToolbarActionView : public views::MenuButton,
void OnMenuButtonClicked(views::View* sender,
const gfx::Point& point) override;
- // content::NotificationObserver:
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) override;
-
// views::InkDropHost:
void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
@@ -181,8 +173,6 @@ class ToolbarActionView : public views::MenuButton,
// The time the popup was last closed.
base::TimeTicks popup_closed_time_;
- content::NotificationRegistrar registrar_;
-
base::WeakPtrFactory<ToolbarActionView> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(ToolbarActionView);

Powered by Google App Engine
This is Rietveld 408576698