Chromium Code Reviews| Index: chrome/browser/prefs/browser_prefs.cc |
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc |
| index db1be73ef1c500be57b449de78040e829dcae033..2098cf4585b9585381a62118c4b526e46a0b0a7f 100644 |
| --- a/chrome/browser/prefs/browser_prefs.cc |
| +++ b/chrome/browser/prefs/browser_prefs.cc |
| @@ -63,6 +63,7 @@ |
| #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| +#include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" |
| #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| #include "chrome/browser/ui/webui/flags_ui.h" |
| #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| @@ -170,6 +171,7 @@ void RegisterLocalState(PrefService* local_state) { |
| chromeos::WizardController::RegisterPrefs(local_state); |
| policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
| policy::DeviceStatusCollector::RegisterPrefs(local_state); |
| + ChromeShellDelegate::RegisterLocalPrefs(local_state); |
| #endif |
| #if defined(OS_MACOSX) |
| @@ -246,6 +248,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { |
| #if defined(OS_CHROMEOS) |
| chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); |
| + ChromeShellDelegate::RegisterUserPrefs(user_prefs); |
|
Mattias Nissler (ping if slow)
2012/07/09 09:30:12
I think making this OS_CHROMEOS only will break, b
qfel
2012/07/11 12:34:49
Updated to make profile pref always present, and l
|
| #endif |
| #if defined(OS_MACOSX) |