Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 561943002: Reland: Add GCMChannelStatusSyncer to schedule requests and enable/disable GCM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/services/gcm/gcm_desktop_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/services/gcm/gcm_desktop_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698