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

Unified Diff: chrome/browser/ui/views/toolbar_view.h

Issue 11348165: Remove PrefObserver usages, batch 10. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android Created 8 years, 1 month 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_view.h
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index 34fc81390c9f27447fcc24d6419899e748fd12dd..404be22f35db40cd7b32e5d592990bced0727fb1 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -10,7 +10,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
-#include "base/prefs/public/pref_observer.h"
#include "chrome/browser/api/prefs/pref_member.h"
#include "chrome/browser/command_observer.h"
#include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
@@ -40,8 +39,7 @@ class ToolbarView : public views::AccessiblePaneView,
public content::NotificationObserver,
public CommandObserver,
public views::ButtonListener,
- public views::WidgetObserver,
- public PrefObserver {
+ public views::WidgetObserver {
public:
// The view class name.
static const char kViewClassName[];
@@ -127,10 +125,6 @@ class ToolbarView : public views::AccessiblePaneView,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // Overridden from PrefObserver:
- virtual void OnPreferenceChanged(PrefServiceBase* service,
- const std::string& pref_name) OVERRIDE;
-
// Overridden from ui::AcceleratorProvider:
virtual bool GetAcceleratorForCommandId(
int command_id, ui::Accelerator* accelerator) OVERRIDE;
@@ -198,9 +192,7 @@ class ToolbarView : public views::AccessiblePaneView,
// Updates the badge and the accessible name of the app menu (Wrench).
void UpdateAppMenuState();
- // Gets a badge for the wrench icon corresponding to the number of
- // unacknowledged background pages in the system.
- gfx::ImageSkia GetBackgroundPageBadge();
+ void OnShowHomeButtonChanged();
// The model that contains the security level, text, icon to display...
ToolbarModel* model_;

Powered by Google App Engine
This is Rietveld 408576698