Second batch of fixing prefs registrations.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright 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 1468 matching lines @@
   if (!GetBrowserWindowForNativeWindow(window))
     return NULL;
   return window;
 }
 
 GtkWidget* BrowserWindowGtk::titlebar_widget() const {
   return titlebar_->widget();
 }
 
 // static
-void BrowserWindowGtk::RegisterUserPrefs(PrefService* prefs,
-                                         PrefRegistrySyncable* registry) {
-  // TODO(joi): Remove PrefService parameter.
+void BrowserWindowGtk::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   bool custom_frame_default = false;
   // Avoid checking the window manager if we're not connected to an X server (as
   // is the case in Valgrind tests).
-  if (ui::XDisplayExists() &&
-      !prefs->HasPrefPath(prefs::kUseCustomChromeFrame)) {
+  if (ui::XDisplayExists()) {

[Mattias Nissler (ping if slow), 2013/02/15 12:23:15]

nit: no need for curlies any longer.

[Jói, 2013/02/18 16:05:42]

Done.

     custom_frame_default = GetCustomFramePrefDefault();
   }
   registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
                                 custom_frame_default,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 WebContents* BrowserWindowGtk::GetDisplayedTab() {
   return contents_container_->GetVisibleTab();
 }
@@ skipping 902 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;
 }