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 0035f4b03bc16242c121a18b39f53957c0b815f3..55ff6b2f1b5103cb18b5bb340ef32b3d2493e247 100644 |
| --- a/chrome/browser/prefs/browser_prefs.cc |
| +++ b/chrome/browser/prefs/browser_prefs.cc |
| @@ -157,6 +157,7 @@ |
| #endif |
| #if defined(OS_ANDROID) |
| +#include "blimp/client/public/blimp_client_context.h" |
| #include "chrome/browser/notifications/notification_platform_bridge_android.h" |
| #include "components/ntp_snippets/offline_pages/offline_page_suggestions_provider.h" |
| #else |
| @@ -398,6 +399,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) { |
| #endif // !defined(OS_CHROMEOS) |
| #endif // !defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) |
| + blimp::client::BlimpClientContext::RegisterPrefs(registry); |
| +#endif |
| + |
|
Menglin
2016/09/30 23:48:57
in fact i'm adding this to the wrong place. I shou
David Trainor- moved to gerrit
2016/10/01 03:26:34
What's the difference between the two? I'm not qu
Menglin
2016/10/03 23:08:26
I asked tommy. I think conceptually local prefs ar
|
| #if defined(OS_CHROMEOS) |
| ChromeOSMetricsProvider::RegisterPrefs(registry); |
| chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); |