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
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 8020c4fa..f96b39ed 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 @@
#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 @@
#if defined(TOOLKIT_GTK)
BrowserWindowGtk::RegisterUserPrefs(user_prefs);
#endif
+#if defined(OS_CHROMEOS)
+ chromeos::Preferences::RegisterUserPrefs(user_prefs);
+#endif
}
} // namespace browser
