Remove PrefObserver usages, batch 12.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.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.h"
 
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
@@ skipping 157 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, this);
+  pref_change_registrar_.Add(
+      prefs::kPinnedLauncherApps,
+      base::Bind(&ChromeLauncherController::UpdateAppLaunchersFromPref,
+                 base::Unretained(this)));
 }
 
 ChromeLauncherController::~ChromeLauncherController() {
   // 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) {
     i->second->OnRemoved();
@@ skipping 581 matching lines @@
       if (IsAppPinned(extension->id()))
         DoUnpinAppsWithID(extension->id());
       app_icon_loader_->ClearImage(extension->id());
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type=" << type;
   }
 }
 
-void ChromeLauncherController::OnPreferenceChanged(
-    PrefServiceBase* service,
-    const std::string& pref_name) {
-  if (pref_name == prefs::kPinnedLauncherApps) {
-    UpdateAppLaunchersFromPref();
-  } else if (pref_name == prefs::kShelfAlignmentLocal) {
-    SetShelfAlignmentFromPrefs();

[Mattias Nissler (ping if slow), 2012/11/21 11:31:04]

Hm, maybe the code is missing pref change notifications for these?

[Jói, 2012/11/21 12:59:33]

davemoore: Do you know? The code prior to this change certainly wasn't listening
for these notifications. I also checked my original change to switch prefs
notifications from content::NotificationObserver to PrefObserver, and it made no
change to the prefs notifications this class subscribes to (see
https://chromiumcodereview.appspot.com/11345008/diff/31023/chrome/browser/ui/...).

[sky, 2012/11/29 01:49:02]

See line 236 old.

-  } else if (pref_name == prefs::kShelfAutoHideBehaviorLocal) {
-    SetShelfAutoHideBehaviorFromPrefs();
-  } else {
-    NOTREACHED() << "Unexpected pref change for " << pref_name;
-  }
-}
-
 void ChromeLauncherController::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, this);

[Mattias Nissler (ping if slow), 2012/11/21 11:31:04]

I think you missed this instance.

[Jói, 2012/11/21 12:59:33]

Thanks for the catch.  The trybots also failed on compile (it's Ash so didn't
get compiled locally on my Chrome for Linux build).  I've fixed this.

 }
 
 void ChromeLauncherController::SetAppTabHelperForTest(AppTabHelper* helper) {
   app_tab_helper_.reset(helper);
 }
 
 void ChromeLauncherController::SetAppIconLoaderForTest(AppIconLoader* loader) {
   app_icon_loader_.reset(loader);
 }
 
@@ skipping 200 matching lines @@
       new AppShortcutLauncherItemController(app_id, this);
   ash::LauncherID launcher_id = InsertAppLauncherItem(
       controller, app_id, ash::STATUS_CLOSED, index);
   return launcher_id;
 }
 
 bool ChromeLauncherController::HasItemController(ash::LauncherID id) const {
   return id_to_item_controller_map_.find(id) !=
          id_to_item_controller_map_.end();
 }