summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/browser_prefs.cc
diff options
context:
space:
mode:
authormgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-13 14:43:34 +0000
committermgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-13 14:43:34 +0000
commitaf97be4c61bb74f1fcd534e8590294c003bf10af (patch)
treecb458320b5a5ec4ae44d4d89c3a765608bc338cd /chrome/browser/prefs/browser_prefs.cc
parente456c74ed6b58685ba73cfb422f0f89c77421c34 (diff)
downloadchromium_src-af97be4c61bb74f1fcd534e8590294c003bf10af.zip
chromium_src-af97be4c61bb74f1fcd534e8590294c003bf10af.tar.gz
chromium_src-af97be4c61bb74f1fcd534e8590294c003bf10af.tar.bz2
Linux Aura: Use system title bar is now set by preference, not flag.
The "Use system title bar and borders" preference can now be set on Linux Aura, through the settings page or tabstrip menu, and is used to determine whether the system title bar or custom Chrome title bar style is used. Changing the preference dynamically updates the browser style. Removed the --use-system-title-bar flag. BUG=317859 Review URL: https://codereview.chromium.org/146363002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 5336584..cfad5a1 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -324,7 +324,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
#endif
#if defined(TOOLKIT_VIEWS)
- RegisterBrowserViewPrefs(registry);
+ RegisterBrowserViewLocalPrefs(registry);
RegisterTabStripLayoutTypePrefs(registry);
#endif
}
@@ -452,6 +452,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
#endif
#if defined(TOOLKIT_VIEWS)
+ RegisterBrowserViewProfilePrefs(registry);
RegisterInvertBubbleUserPrefs(registry);
#elif defined(TOOLKIT_GTK)
BrowserWindowGtk::RegisterProfilePrefs(registry);