Remove PrefObserver usage, batch 3.

Remove PrefObserver usage, batch 3.

This also introduces an accessor for the PrefServiceBase* kept by
PrefChangeRegistrar.

TBR=bauerb@chromium.org,achuith@chromium.org
BUG=155525
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167680

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

LGTM with nits.

http://codereview.chromium.org/11293249/diff/1/base/prefs/public/pref_change_...
File base/prefs/public/pref_change_registrar.cc (right):

http://codereview.chromium.org/11293249/diff/1/base/prefs/public/pref_change_...
base/prefs/public/pref_change_registrar.cc:98: 
no trailing newlines please.

http://codereview.chromium.org/11293249/diff/1/chrome/browser/chromeos/system...
File chrome/browser/chromeos/system/ash_system_tray_delegate.cc (right):

http://codereview.chromium.org/11293249/diff/1/chrome/browser/chromeos/system...
chrome/browser/chromeos/system/ash_system_tray_delegate.cc:756:
pref_registrar_->Add(prefs::kUse24HourClock,
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]

Nits addressed, also fixed a ChromeOS build problem.

Cheers,
Jói

http://codereview.chromium.org/11293249/diff/1/base/prefs/public/pref_change_...
File base/prefs/public/pref_change_registrar.cc (right):

http://codereview.chromium.org/11293249/diff/1/base/prefs/public/pref_change_...
base/prefs/public/pref_change_registrar.cc:98: 
On 2012/11/13 14:11:31, Mattias Nissler wrote:
> no trailing newlines please.

Done.

http://codereview.chromium.org/11293249/diff/1/chrome/browser/chromeos/system...
File chrome/browser/chromeos/system/ash_system_tray_delegate.cc (right):

http://codereview.chromium.org/11293249/diff/1/chrome/browser/chromeos/system...
chrome/browser/chromeos/system/ash_system_tray_delegate.cc:756:
pref_registrar_->Add(prefs::kUse24HourClock,
On 2012/11/13 14:11:31, Mattias Nissler wrote:
> nit: I'd put a linebreak here as well for consistency with the two blocks
below,
> even if the linebreak is not needed.

Done.

[Mattias Nissler (ping if slow), 2012-11-13 14:59:48]

LGTM

[Mattias Nissler (ping if slow), 2012-11-13 14:59:48]

LGTM

[Jói, 2012-11-13 15:12:13]

PTAL, I needed to make the prefs() accessor on PrefMemberBase public, and I
think probably the pref_name() accessor should be too, but doesn't have to be
for this change.

Cheers,
Jói

[Mattias Nissler (ping if slow), 2012-11-13 15:47:02]

http://codereview.chromium.org/11293249/diff/4003/chrome/browser/api/prefs/pr...
File chrome/browser/api/prefs/pref_member.h (right):

http://codereview.chromium.org/11293249/diff/4003/chrome/browser/api/prefs/pr...
chrome/browser/api/prefs/pref_member.h:50: const std::string& pref_name() const
{ return pref_name_; }
Note that there already is a public GetPrefName in PrefMember below, I think we
only want one.

[Jói, 2012-11-13 16:28:23]

http://codereview.chromium.org/11293249/diff/4003/chrome/browser/api/prefs/pr...
File chrome/browser/api/prefs/pref_member.h (right):

http://codereview.chromium.org/11293249/diff/4003/chrome/browser/api/prefs/pr...
chrome/browser/api/prefs/pref_member.h:50: const std::string& pref_name() const
{ return pref_name_; }
On 2012/11/13 15:47:03, Mattias Nissler wrote:
> Note that there already is a public GetPrefName in PrefMember below, I think
we
> only want one.

Right you are, sorry I didn't notice.  Moved this back.

[Mattias Nissler (ping if slow), 2012-11-13 16:29:11]

LGTM

[commit-bot: I haz the power, 2012-11-14 12:37:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/joi@chromium.org/11293249/9010

[commit-bot: I haz the power, 2012-11-14 12:37:14]

Failed to apply patch for
chrome/browser/chromeos/system/ash_system_tray_delegate.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chromeos/system/ash_system_tray_delegate.cc
  Hunk #1 succeeded at 29 (offset 2 lines).
  Hunk #2 succeeded at 154 (offset 2 lines).
  Hunk #3 succeeded at 217 (offset 1 line).
  Hunk #4 succeeded at 756 (offset 3 lines).
  Hunk #5 FAILED at 779.
  Hunk #6 FAILED at 1143.
  2 out of 6 hunks FAILED -- saving rejects to file
chrome/browser/chromeos/system/ash_system_tray_delegate.cc.rej

Patch:       chrome/browser/chromeos/system/ash_system_tray_delegate.cc
Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index
9ac78405ad2f5b8083346b689229034c196988d9..9816028cd42576ba66fc532580dff6126c3fdf2f
100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -27,7 +27,6 @@
 #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"
@@ -153,7 +152,6 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
                            public NetworkLibrary::NetworkManagerObserver,
                            public NetworkLibrary::NetworkObserver,
                            public NetworkLibrary::CellularDataPlanObserver,
-                           public PrefObserver,
                            public google_apis::DriveServiceObserver,
                            public content::NotificationObserver,
                            public input_method::InputMethodManager::Observer,
@@ -218,8 +216,11 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     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::OnSpokenFeedbackEnabledChanged,
+                   base::Unretained(this)));
 
     network_icon_->SetResourceColorTheme(NetworkMenuIcon::COLOR_LIGHT);
     network_icon_dark_->SetResourceColorTheme(NetworkMenuIcon::COLOR_DARK);
@@ -752,11 +753,20 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     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,
+        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);
   }
@@ -769,20 +779,20 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     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));
     }
   }
 
@@ -1133,24 +1143,18 @@ class SystemTrayDelegate : public
ash::SystemTrayDelegate,
     }
   }
 
-  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));
     }
   }

[Jói, 2012-11-14 13:53:13]

TBR=bauerb@chromium.org,achuith@chromium.org for OWNERS rubber stamp for these
directories:
    chrome/browser/content_settings
    chrome/browser/chromeos

These are updates to match an API change in Prefs, already reviewed by Prefs
owner mnissler@.

Cheers,
Jói

[commit-bot: I haz the power, 2012-11-14 13:53:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/joi@chromium.org/11293249/12004

[commit-bot: I haz the power, 2012-11-14 15:34:47]

Change committed as 167680