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 7e0866942f45979c80d3b387082165ce230c0061..0245b3964da0973f7bd762f3102f98cdac722b58 100644 |
| --- a/chrome/browser/prefs/browser_prefs.cc |
| +++ b/chrome/browser/prefs/browser_prefs.cc |
| @@ -187,6 +187,7 @@ |
| #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" |
| #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
| #include "chrome/browser/metrics/chromeos_metrics_provider.h" |
| +#include "chrome/browser/ui/app_list/arc_app_prefs.h" |
| #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" |
| #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h" |
| #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" |
| @@ -194,6 +195,7 @@ |
| #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
| #include "chromeos/timezone/timezone_resolver.h" |
| +#include "components/arc/arc_prefs.h" |
|
khmel1
2015/11/12 08:18:13
Sorry, this accidentally came after getting latest
|
| #include "components/invalidation/impl/invalidator_storage.h" |
| #else |
| #include "chrome/browser/extensions/default_apps.h" |
| @@ -502,6 +504,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: |
| RegisterProfilePrefs(registry); |
| FlagsUI::RegisterProfilePrefs(registry); |
| + arc::ArcPrefs::RegisterProfilePrefs(registry); |
| + ArcAppPrefs::RegisterProfilePrefs(registry); |
| #endif |
| #if defined(OS_WIN) |