Revert 170483 - Remove PrefObserver usages, batch 12.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h"
 
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
@@ skipping 156 matching lines @@
   app_tab_helper_.reset(new LauncherAppTabHelper(profile_));
   app_icon_loader_.reset(new LauncherAppIconLoader(profile_, this));
 
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_EXTENSION_LOADED,
                               content::Source<Profile>(profile_));
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_EXTENSION_UNLOADED,
                               content::Source<Profile>(profile_));
   pref_change_registrar_.Init(profile_->GetPrefs());
-  pref_change_registrar_.Add(
-      prefs::kPinnedLauncherApps,
-      base::Bind(&ChromeLauncherControllerPerBrowser::
-                     UpdateAppLaunchersFromPref,
-                 base::Unretained(this)));
+  pref_change_registrar_.Add(prefs::kPinnedLauncherApps, this);
 }
 
 ChromeLauncherControllerPerBrowser::~ChromeLauncherControllerPerBrowser() {
   // Reset the shell window controller here since it has a weak pointer to
   // this.
   shell_window_controller_.reset();
 
   model_->RemoveObserver(this);
   for (IDToItemControllerMap::iterator i = id_to_item_controller_map_.begin();
        i != id_to_item_controller_map_.end(); ++i) {
@@ skipping 34 matching lines @@
     updater.Get()->Clear();
   }
 
   UpdateAppLaunchersFromPref();
 
   // TODO(sky): update unit test so that this test isn't necessary.
   if (ash::Shell::HasInstance()) {
     SetShelfAutoHideBehaviorFromPrefs();
     SetShelfAlignmentFromPrefs();
     PrefService* prefs = profile_->GetPrefs();
-    if (prefs->GetString(prefs::kShelfAlignmentLocal).empty()) {
-      pref_change_registrar_.Add(
-          prefs::kShelfAlignmentLocal,
-          base::Bind(&ChromeLauncherControllerPerBrowser::
-                         SetShelfAlignmentFromPrefs,
-                     base::Unretained(this)));
-    }
-    if (prefs->GetString(prefs::kShelfAutoHideBehaviorLocal).empty()) {
-      pref_change_registrar_.Add(
-          prefs::kShelfAutoHideBehaviorLocal,
-          base::Bind(&ChromeLauncherControllerPerBrowser::
-                         SetShelfAutoHideBehaviorFromPrefs,
-                     base::Unretained(this)));
+    if (prefs->GetString(prefs::kShelfAlignmentLocal).empty() ||
+        prefs->GetString(prefs::kShelfAutoHideBehaviorLocal).empty()) {
+      prefs->AddObserver(this);
     }
     ash::Shell::GetInstance()->AddShellObserver(this);
   }
 }
 
 ash::LauncherID ChromeLauncherControllerPerBrowser::CreateTabbedLauncherItem(
     LauncherItemController* controller,
     IncognitoState is_incognito,
     ash::LauncherItemStatus status) {
   ash::LauncherID id = model_->next_id();
@@ skipping 536 matching lines @@
       if (IsAppPinned(extension->id()))
         DoUnpinAppsWithID(extension->id());
       app_icon_loader_->ClearImage(extension->id());
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type=" << type;
   }
 }
 
+void ChromeLauncherControllerPerBrowser::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 ChromeLauncherControllerPerBrowser::OnShelfAlignmentChanged() {
   const char* pref_value = NULL;
   // TODO(oshima): Support multiple displays.
   switch (ash::Shell::GetInstance()->GetShelfAlignment(
       ash::Shell::GetPrimaryRootWindow())) {
     case ash::SHELF_ALIGNMENT_BOTTOM:
       pref_value = ash::kShelfAlignmentBottom;
       break;
     case ash::SHELF_ALIGNMENT_LEFT:
       pref_value = ash::kShelfAlignmentLeft;
@@ skipping 48 matching lines @@
         ash::LauncherID id = model_->items()[i].id;
         if (HasItemController(id) && IsPinned(id)) {
           base::DictionaryValue* app_value = ash::CreateAppDict(
               id_to_item_controller_map_[id]->app_id());
           if (app_value)
             updater->Append(app_value);
         }
       }
     }
   }
-  pref_change_registrar_.Add(
-      prefs::kPinnedLauncherApps,
-      base::Bind(&ChromeLauncherControllerPerBrowser::
-                     UpdateAppLaunchersFromPref,
-                 base::Unretained(this)));
+  pref_change_registrar_.Add(prefs::kPinnedLauncherApps, this);
 }
 
 ash::LauncherModel* ChromeLauncherControllerPerBrowser::model() {
   return model_;
 }
 
 Profile* ChromeLauncherControllerPerBrowser::profile() {
   return profile_;
 }
 
@@ skipping 222 matching lines @@
     AppIconLoader* loader) {
   app_icon_loader_.reset(loader);
 }
 
 const std::string&
 ChromeLauncherControllerPerBrowser::GetAppIdFromLauncherIdForTest(
     ash::LauncherID id) {
   return id_to_item_controller_map_[id]->app_id();
 }