Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/gtk/browser_window_gtk.cc

Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 92a4ba36c220f82610bf06fd54a87423bf73ed41..e437a8f28d6583450b032b626e89e45c7a9e6d04 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1185,26 +1185,21 @@ void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() {
 void BrowserWindowGtk::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      std::string* pref_name = content::Details<std::string>(details).ptr();
-      if (*pref_name == prefs::kUseCustomChromeFrame) {
-        UpdateCustomFrame();
-        ui::SetHideTitlebarWhenMaximizedProperty(
-            ui::GetX11WindowFromGtkWidget(GTK_WIDGET(window_)),
-            UseCustomFrame() ? ui::HIDE_TITLEBAR_WHEN_MAXIMIZED
-                             : ui::SHOW_TITLEBAR_WHEN_MAXIMIZED);
-      } else {
-        NOTREACHED() << "Got pref change notification we didn't register for!";
-      }
-      break;
-    }
-    case chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED:
-      // The profile avatar icon may have changed.
-      gtk_util::SetWindowIcon(window_, browser_->profile());
-      break;
-    default:
-      break;
+  DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, type);
+  // The profile avatar icon may have changed.
+  gtk_util::SetWindowIcon(window_, browser_->profile());
+}
+
+void BrowserWindowGtk::OnPreferenceChanged(PrefServiceBase* service,
+                                           const std::string& pref_name) {
+  if (pref_name == prefs::kUseCustomChromeFrame) {
+    UpdateCustomFrame();
+    ui::SetHideTitlebarWhenMaximizedProperty(
+        ui::GetX11WindowFromGtkWidget(GTK_WIDGET(window_)),
+        UseCustomFrame() ? ui::HIDE_TITLEBAR_WHEN_MAXIMIZED
+        : ui::SHOW_TITLEBAR_WHEN_MAXIMIZED);

[Mattias Nissler (ping if slow), 2012/10/31 13:29:36]

indentation

[Jói, 2012/10/31 14:56:26]

Done.

+  } else {
+    NOTREACHED() << "Got pref change notification we didn't register for!";
   }
 }