Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/gtk/browser_window_gtk.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/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 1167 matching lines @@
   new PasswordGenerationBubbleGtk(rect, form, tab_contents, password_generator);
 }
 
 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() {
   DownloadInProgressDialogGtk::Show(browser(), GetNativeWindow());
 }
 
 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!";
   }
 }
 
 void BrowserWindowGtk::TabDetachedAt(TabContents* contents, int index) {
   // We use index here rather than comparing |contents| because by this time
   // the model has already removed |contents| from its list, so
   // chrome::GetActiveWebContents(browser_.get()) will return NULL or something
   // else.
   if (index == browser_->active_index()) {
     infobar_container_->ChangeTabContents(NULL);
@@ skipping 1207 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }