diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 13:14:04 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 13:14:04 +0000 |
| commit | c753f148dc1a10cd9461e50e03dc2a93652c13d1 (patch) | |
| tree | 9e1a8558556a0f31d4e527c4c203d076f8cca920 /chrome/browser/ui/gtk/browser_window_gtk.cc | |
| parent | e6dbde892ddea9e179fa76e4db1333e83776d160 (diff) | |
| download | chromium_src-c753f148dc1a10cd9461e50e03dc2a93652c13d1.zip chromium_src-c753f148dc1a10cd9461e50e03dc2a93652c13d1.tar.gz chromium_src-c753f148dc1a10cd9461e50e03dc2a93652c13d1.tar.bz2 | |
Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.
Minimize usage of PrefServiceSyncable. It is mostly an implementation detail of ProfileImpl and the sync integration.
TBR=ben@chromium.org
BUG=155525
Review URL: https://codereview.chromium.org/12079097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 93300ac..cd11e1e 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,9 @@ GtkWidget* BrowserWindowGtk::titlebar_widget() const { } // static -void BrowserWindowGtk::RegisterUserPrefs(PrefServiceSyncable* prefs) { +void BrowserWindowGtk::RegisterUserPrefs(PrefService* prefs, + PrefRegistrySyncable* registry) { + // TODO(joi): Remove PrefService parameter. 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). @@ -1493,9 +1496,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() { |