diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:18:51 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:18:51 +0000 |
| commit | 9acc48601ea4aff4e5ec977c0dd089e887ba5ffd (patch) | |
| tree | 9c0ef6715ab756b6c8eafb5f4385eaab73a3a8ab /chrome/browser/browser_prefs.cc | |
| parent | 8d7690b29c0572c62bbe72817ac3b5195bf38e42 (diff) | |
| download | chromium_src-9acc48601ea4aff4e5ec977c0dd089e887ba5ffd.zip chromium_src-9acc48601ea4aff4e5ec977c0dd089e887ba5ffd.tar.gz chromium_src-9acc48601ea4aff4e5ec977c0dd089e887ba5ffd.tar.bz2 | |
Add -profile command line switch
Review URL: http://codereview.chromium.org/384062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 8020c4f..f96b39e 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -45,9 +45,18 @@ #include "chrome/browser/gtk/browser_window_gtk.h" #endif +#if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/preferences.h" +#endif + namespace browser { void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { + RegisterLocalState(local_state); + RegisterUserPrefs(user_prefs); +} + +void RegisterLocalState(PrefService* local_state) { // Prefs in Local State Browser::RegisterPrefs(local_state); WebCacheManager::RegisterPrefs(local_state); @@ -67,7 +76,9 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { #if defined(OS_WIN) || defined(OS_LINUX) TaskManager::RegisterPrefs(local_state); #endif +} +void RegisterUserPrefs(PrefService* user_prefs) { // User prefs SessionStartupPref::RegisterUserPrefs(user_prefs); Browser::RegisterUserPrefs(user_prefs); @@ -87,6 +98,9 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { #if defined(TOOLKIT_GTK) BrowserWindowGtk::RegisterUserPrefs(user_prefs); #endif +#if defined(OS_CHROMEOS) + chromeos::Preferences::RegisterUserPrefs(user_prefs); +#endif } } // namespace browser |