Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(479)

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 93300ac20feb92cbe376dfb7342d3429f98201c8..ba419864b80c316636f3ef3605926d2e33349f73 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -29,6 +29,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/download/download_item_model.h"
#include "chrome/browser/extensions/tab_helper.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile.h"
@@ -1485,7 +1486,8 @@ GtkWidget* BrowserWindowGtk::titlebar_widget() const {
}
// static
-void BrowserWindowGtk::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void BrowserWindowGtk::RegisterUserPrefs(PrefService* prefs,
+ 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).
Mattias Nissler (ping if slow) 2013/02/06 17:53:33 TODO remove prefs parameter.
Jói 2013/02/07 14:52:32 Done.
@@ -1493,9 +1495,9 @@ void BrowserWindowGtk::RegisterUserPrefs(PrefServiceSyncable* prefs) {
!prefs->HasPrefPath(prefs::kUseCustomChromeFrame)) {
custom_frame_default = GetCustomFramePrefDefault();
}
- prefs->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
- custom_frame_default,
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
+ custom_frame_default,
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
WebContents* BrowserWindowGtk::GetDisplayedTab() {

Powered by Google App Engine
This is Rietveld 408576698