diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 01:13:37 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 01:13:37 +0000 |
| commit | fee8f0222a5f2a377ba5d7f2d3383481c02eafac (patch) | |
| tree | 0542f26a1076b07d0857298b7a9fc694a61422cb /chrome/browser/browser_prefs.cc | |
| parent | 8fa18a33d2dee21f748139ef503d08ebb4b706af (diff) | |
| download | chromium_src-fee8f0222a5f2a377ba5d7f2d3383481c02eafac.zip chromium_src-fee8f0222a5f2a377ba5d7f2d3383481c02eafac.tar.gz chromium_src-fee8f0222a5f2a377ba5d7f2d3383481c02eafac.tar.bz2 | |
Add a pref for the number of showing icons in the browser actions toolbar.
Also fix some issues on GTK concerning the proper behavior when adding/removing browser actions (container sizing + chevron visibility).
Windows uses a different pref (kBrowserActionContainerWidth), which is measured in pixels; it should be migrated to the new pref.
Also, register extension prefs during startup.
BUG=32101
TEST=manual
Review URL: http://codereview.chromium.org/841007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 8d6b8ce..a973d43 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -13,6 +13,7 @@ #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/extensions/extension_dom_ui.h" +#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extensions_ui.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/geolocation/geolocation_prefs.h" @@ -70,7 +71,7 @@ void RegisterLocalState(PrefService* local_state) { chrome_browser_net::RegisterPrefs(local_state); bookmark_utils::RegisterPrefs(local_state); PageInfoModel::RegisterPrefs(local_state); -#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port +#if defined(TOOLKIT_VIEWS) BrowserView::RegisterBrowserViewPrefs(local_state); #endif TaskManager::RegisterPrefs(local_state); @@ -98,10 +99,10 @@ void RegisterUserPrefs(PrefService* user_prefs) { HostZoomMap::RegisterUserPrefs(user_prefs); DevToolsManager::RegisterUserPrefs(user_prefs); Blacklist::RegisterUserPrefs(user_prefs); -#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port. + ExtensionPrefs::RegisterUserPrefs(user_prefs); +#if defined(TOOLKIT_VIEWS) BrowserActionsContainer::RegisterUserPrefs(user_prefs); -#endif -#if defined(TOOLKIT_GTK) +#elif defined(TOOLKIT_GTK) BrowserWindowGtk::RegisterUserPrefs(user_prefs); #endif #if defined(OS_CHROMEOS) |