| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 6f928e270655acac9db5044563e8f81b5beb98b3..de0d749950c8b0a1a5c5fcb9f702301c0f37ae5b 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -83,6 +83,7 @@
|
| #include "components/autofill/core/browser/autofill_manager.h"
|
| #include "components/bookmarks/browser/bookmark_utils.h"
|
| #include "components/dom_distiller/core/distilled_page_prefs.h"
|
| +#include "components/gcm_driver/gcm_channel_status_syncer.h"
|
| #include "components/google/core/browser/google_pref_names.h"
|
| #include "components/google/core/browser/google_url_tracker.h"
|
| #include "components/network_time/network_time_tracker.h"
|
| @@ -348,6 +349,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
| RegisterBrowserViewLocalPrefs(registry);
|
| #endif
|
|
|
| +#if !defined(OS_ANDROID)
|
| + // The native GCM is used on Android instead.
|
| + gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
|
| +#endif // !defined(OS_ANDROID)
|
| +
|
| // Preferences registered only for migration (clearing or moving to a new key)
|
| // go here.
|
| #if !defined(OS_ANDROID)
|
| @@ -442,6 +448,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
|
| extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
|
| first_run::RegisterProfilePrefs(registry);
|
| + gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
|
| NewTabUI::RegisterProfilePrefs(registry);
|
| PepperFlashSettingsManager::RegisterProfilePrefs(registry);
|
| PinnedTabCodec::RegisterProfilePrefs(registry);
|
|
|