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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

Issue 11280115: Remove PrefObserver usages, batch 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix removal of PrefServiceObserver usage. Created 8 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/ash/launcher/chrome_launcher_controller_per_app.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
index dcba92806e6ff8e5dc52f03afd5d8e10fbafdf19..4300c8437d2c1d34aa864e17290a2addf5785f76 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc
@@ -173,7 +173,10 @@ ChromeLauncherControllerPerApp::ChromeLauncherControllerPerApp(
chrome::NOTIFICATION_EXTENSION_UNLOADED,
content::Source<Profile>(profile_));
pref_change_registrar_.Init(profile_->GetPrefs());
- pref_change_registrar_.Add(prefs::kPinnedLauncherApps, this);
+ pref_change_registrar_.Add(
+ prefs::kPinnedLauncherApps,
+ base::Bind(&ChromeLauncherControllerPerApp::UpdateAppLaunchersFromPref,
+ base::Unretained(this)));
}
ChromeLauncherControllerPerApp::~ChromeLauncherControllerPerApp() {
@@ -229,6 +232,8 @@ void ChromeLauncherControllerPerApp::Init() {
PrefService* prefs = profile_->GetPrefs();
if (prefs->GetString(prefs::kShelfAlignmentLocal).empty() ||
prefs->GetString(prefs::kShelfAutoHideBehaviorLocal).empty()) {
+ // This causes OnIsSyncingChanged to be called when the value of
+ // PrefService::IsSyncing() changes.
prefs->AddObserver(this);
}
ash::Shell::GetInstance()->AddShellObserver(this);
@@ -783,20 +788,6 @@ void ChromeLauncherControllerPerApp::Observe(
}
}
-void ChromeLauncherControllerPerApp::OnPreferenceChanged(
- PrefServiceBase* service,
- const std::string& pref_name) {
- if (pref_name == prefs::kPinnedLauncherApps) {
- UpdateAppLaunchersFromPref();
- } else if (pref_name == prefs::kShelfAlignmentLocal) {
- SetShelfAlignmentFromPrefs();
- } else if (pref_name == prefs::kShelfAutoHideBehaviorLocal) {
- SetShelfAutoHideBehaviorFromPrefs();
- } else {
- NOTREACHED() << "Unexpected pref change for " << pref_name;
- }
-}
-
void ChromeLauncherControllerPerApp::OnShelfAlignmentChanged() {
const char* pref_value = NULL;
// TODO(oshima): Support multiple displays.
@@ -865,7 +856,10 @@ void ChromeLauncherControllerPerApp::PersistPinnedState() {
}
}
}
- pref_change_registrar_.Add(prefs::kPinnedLauncherApps, this);
+ pref_change_registrar_.Add(
+ prefs::kPinnedLauncherApps,
+ base::Bind(&ChromeLauncherControllerPerApp::UpdateAppLaunchersFromPref,
+ base::Unretained(this)));
}
ash::LauncherModel* ChromeLauncherControllerPerApp::model() {

Powered by Google App Engine
This is Rietveld 408576698