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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h

Issue 11308295: Revert 170483 - Remove PrefObserver usages, batch 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/ash/launcher/chrome_launcher_controller_per_browser.h
===================================================================
--- chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h (revision 170518)
+++ chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h (working copy)
@@ -18,6 +18,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/prefs/pref_service_observer.h"
#include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
@@ -60,6 +61,7 @@
public ash::ShellObserver,
public ChromeLauncherController,
public content::NotificationObserver,
+ public PrefObserver,
public PrefServiceObserver,
public AppSyncUIStateObserver {
public:
@@ -235,6 +237,10 @@
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 ash::ShellObserver:
virtual void OnShelfAlignmentChanged() OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698