diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 23:42:06 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 23:42:06 +0000 |
| commit | 8fa0849095630e6906d01df81d425f8c192e5ed8 (patch) | |
| tree | b2532b24b79a9e2aa39bf3a040a65fc39e0b24ee /extensions | |
| parent | b32761dcb8b4118458ed3331af8ce87058c0c795 (diff) | |
| download | chromium_src-8fa0849095630e6906d01df81d425f8c192e5ed8.zip chromium_src-8fa0849095630e6906d01df81d425f8c192e5ed8.tar.gz chromium_src-8fa0849095630e6906d01df81d425f8c192e5ed8.tar.bz2 | |
MacViews: Consolidate kBrowserActionContainerWidth pref registration
This pref is currently registered in different places for Mac and
toolkit-views, resulting in problems for toolkit-views on Mac (i.e. it
gets registered twice).
The views pref moved into extension_prefs.cc in r183799. This moves the
mac pref to the same place for increased code cohesion, simplifying a
lot of things.
BUG=155525, 390755
Review URL: https://codereview.chromium.org/378153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/extension_prefs.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc index 030ceda..7799f0d 100644 --- a/extensions/browser/extension_prefs.cc +++ b/extensions/browser/extension_prefs.cc @@ -1972,7 +1972,12 @@ void ExtensionPrefs::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); registry->RegisterListPref(pref_names::kKnownDisabled, user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); -#if defined(TOOLKIT_VIEWS) +#if defined(OS_MACOSX) + registry->RegisterDoublePref( + pref_names::kBrowserActionContainerWidth, + 0, + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); +#else registry->RegisterIntegerPref( pref_names::kBrowserActionContainerWidth, 0, |