Remove PrefObserver usage, batch 3.

chrome/browser/chromeos/system/ash_system_tray_delegate.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/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/brightness/brightness_observer.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/date/clock_observer.h"
 #include "ash/system/drive/drive_observer.h"
 #include "ash/system/ime/ime_observer.h"
 #include "ash/system/logout_button/logout_button_observer.h"
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/user/update_observer.h"
 #include "ash/system/user/user_observer.h"
 #include "ash/volume_control_delegate.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
-#include "base/prefs/public/pref_observer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
@@ skipping 105 matching lines @@
 
 class SystemTrayDelegate : public ash::SystemTrayDelegate,
                            public AudioHandler::VolumeObserver,
                            public PowerManagerClient::Observer,
                            public SessionManagerClient::Observer,
                            public NetworkMenuIcon::Delegate,
                            public NetworkMenu::Delegate,
                            public NetworkLibrary::NetworkManagerObserver,
                            public NetworkLibrary::NetworkObserver,
                            public NetworkLibrary::CellularDataPlanObserver,
-                           public PrefObserver,
                            public google_apis::DriveServiceObserver,
                            public content::NotificationObserver,
                            public input_method::InputMethodManager::Observer,
                            public system::TimezoneSettings::Observer,
                            public device::BluetoothAdapter::Observer,
                            public SystemKeyEventListener::CapsLockObserver,
                            public ash::NetworkTrayDelegate {
  public:
   SystemTrayDelegate()
       : ui_weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(
@@ skipping 44 matching lines @@
     OnNetworkManagerChanged(crosnet);
     crosnet->AddCellularDataPlanObserver(this);
 
     input_method::InputMethodManager::GetInstance()->AddObserver(this);
 
     system::TimezoneSettings::GetInstance()->AddObserver(this);
 
     if (SystemKeyEventListener::GetInstance())
       SystemKeyEventListener::GetInstance()->AddCapsLockObserver(this);
 
-    accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled,
-                                g_browser_process->local_state(), this);
+    accessibility_enabled_.Init(
+        prefs::kSpokenFeedbackEnabled,
+        g_browser_process->local_state(),
+        base::Bind(&SystemTrayDelegate::OnPreferenceChanged,
+                   base::Unretained(this)));
 
     network_icon_->SetResourceColorTheme(NetworkMenuIcon::COLOR_LIGHT);
     network_icon_dark_->SetResourceColorTheme(NetworkMenuIcon::COLOR_DARK);
 
     bluetooth_adapter_ = device::BluetoothAdapterFactory::DefaultAdapter();
     bluetooth_adapter_->AddObserver(this);
   }
 
   virtual ~SystemTrayDelegate() {
     AudioHandler* audiohandler = AudioHandler::GetInstance();
@@ skipping 512 matching lines @@
   Browser* GetAppropriateBrowser() {
     return browser::FindOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord(),
         chrome::HOST_DESKTOP_TYPE_ASH);
   }
 
   void SetProfile(Profile* profile) {
     PrefService* prefs = profile->GetPrefs();
     pref_registrar_.reset(new PrefChangeRegistrar);
     pref_registrar_->Init(prefs);
-    pref_registrar_->Add(prefs::kUse24HourClock, this);
-    pref_registrar_->Add(prefs::kLanguageRemapSearchKeyTo, this);
-    pref_registrar_->Add(prefs::kShowLogoutButtonInTray, this);
-    UpdateClockType(prefs);
-    UpdateShowLogoutButtonInTray(prefs);
+    pref_registrar_->Add(prefs::kUse24HourClock,

[Mattias Nissler (ping if slow), 2012/11/13 14:11:31]

nit: I'd put a linebreak here as well for consistency with the two blocks below,
even if the linebreak is not needed.

[Jói, 2012/11/13 14:22:38]

Done.

+                         base::Bind(&SystemTrayDelegate::UpdateClockType,
+                                    base::Unretained(this)));
+    pref_registrar_->Add(
+        prefs::kLanguageRemapSearchKeyTo,
+        base::Bind(&SystemTrayDelegate::OnLanguageRemapSearchKeyToChanged,
+                   base::Unretained(this)));
+    pref_registrar_->Add(
+        prefs::kShowLogoutButtonInTray,
+        base::Bind(&SystemTrayDelegate::UpdateShowLogoutButtonInTray,
+                   base::Unretained(this)));
+    UpdateClockType();
+    UpdateShowLogoutButtonInTray();
     search_key_mapped_to_ =
         profile->GetPrefs()->GetInteger(prefs::kLanguageRemapSearchKeyTo);
   }
 
   void ObserveGDataUpdates() {
     DriveSystemService* system_service = FindDriveSystemService();
     if (!system_service)
       return;
 
     system_service->drive_service()->AddObserver(this);
   }
 
-  void UpdateClockType(PrefServiceBase* service) {
-    clock_type_ = service->GetBoolean(prefs::kUse24HourClock) ?
+  void UpdateClockType() {
+    clock_type_ = pref_registrar_->prefs()->GetBoolean(prefs::kUse24HourClock) ?
         base::k24HourClock : base::k12HourClock;
     ash::ClockObserver* observer = GetSystemTray()->clock_observer();
     if (observer)
       observer->OnDateFormatChanged();
   }
 
-  void UpdateShowLogoutButtonInTray(PrefServiceBase* service) {
+  void UpdateShowLogoutButtonInTray() {
     ash::LogoutButtonObserver* observer =
         GetSystemTray()->logout_button_observer();
     if (observer) {
       observer->OnShowLogoutButtonInTrayChanged(
-          service->GetBoolean(prefs::kShowLogoutButtonInTray));
+          pref_registrar_->prefs()->GetBoolean(prefs::kShowLogoutButtonInTray));
     }
   }
 
   void NotifyRefreshClock() {
     ash::ClockObserver* observer = GetSystemTray()->clock_observer();
     if (observer)
       observer->Refresh();
   }
 
   void NotifyRefreshNetwork() {
@@ skipping 330 matching lines @@
         ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
             GetUserLoginStatus());
         SetProfile(ProfileManager::GetDefaultProfile());
         break;
       }
       default:
         NOTREACHED();
     }
   }
 
-  virtual void OnPreferenceChanged(PrefServiceBase* service,
-                                   const std::string& pref) OVERRIDE {
-    if (pref == prefs::kUse24HourClock) {
-      UpdateClockType(service);
-    } else if (pref == prefs::kLanguageRemapSearchKeyTo) {
-      search_key_mapped_to_ =
-          service->GetInteger(prefs::kLanguageRemapSearchKeyTo);
-    } else if (pref == prefs::kSpokenFeedbackEnabled) {
-      ash::AccessibilityObserver* observer =
-          GetSystemTray()->accessibility_observer();
-      if (observer) {
-        observer->OnAccessibilityModeChanged(
-            service->GetBoolean(prefs::kSpokenFeedbackEnabled));
-      }
-    } else if (pref == prefs::kShowLogoutButtonInTray) {
-      UpdateShowLogoutButtonInTray(service);
-    } else {
-      NOTREACHED();
+  void OnLanguageRemapSearchKeyToChanged() {
+    search_key_mapped_to_ = pref_registrar_->prefs()->GetInteger(
+        prefs::kLanguageRemapSearchKeyTo);
+  }
+
+  void OnSpokenFeedbackEnabledChanged() {
+    ash::AccessibilityObserver* observer =
+        GetSystemTray()->accessibility_observer();
+    if (observer) {
+      observer->OnAccessibilityModeChanged(
+          accessibility_enabled_->prefs()->GetBoolean(
+              prefs::kSpokenFeedbackEnabled));
     }
   }
 
   // Overridden from InputMethodManager::Observer.
   virtual void InputMethodChanged(
       input_method::InputMethodManager* manager, bool show_message) OVERRIDE {
     NotifyRefreshIME(show_message);
   }
 
   virtual void InputMethodPropertyChanged(
@@ skipping 163 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos