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

Side by Side 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 bauer's comment 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/ui/webui/instant_ui.h" 76 #include "chrome/browser/ui/webui/instant_ui.h"
77 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 77 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
78 #include "chrome/browser/ui/webui/plugins_ui.h" 78 #include "chrome/browser/ui/webui/plugins_ui.h"
79 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 79 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
80 #include "chrome/browser/upgrade_detector.h" 80 #include "chrome/browser/upgrade_detector.h"
81 #include "chrome/browser/web_resource/promo_resource_service.h" 81 #include "chrome/browser/web_resource/promo_resource_service.h"
82 #include "chrome/common/pref_names.h" 82 #include "chrome/common/pref_names.h"
83 #include "components/autofill/core/browser/autofill_manager.h" 83 #include "components/autofill/core/browser/autofill_manager.h"
84 #include "components/bookmarks/browser/bookmark_utils.h" 84 #include "components/bookmarks/browser/bookmark_utils.h"
85 #include "components/dom_distiller/core/distilled_page_prefs.h" 85 #include "components/dom_distiller/core/distilled_page_prefs.h"
86 #include "components/gcm_driver/gcm_channel_status_syncer.h"
86 #include "components/google/core/browser/google_pref_names.h" 87 #include "components/google/core/browser/google_pref_names.h"
87 #include "components/google/core/browser/google_url_tracker.h" 88 #include "components/google/core/browser/google_url_tracker.h"
88 #include "components/network_time/network_time_tracker.h" 89 #include "components/network_time/network_time_tracker.h"
89 #include "components/password_manager/core/browser/password_manager.h" 90 #include "components/password_manager/core/browser/password_manager.h"
90 #include "components/pref_registry/pref_registry_syncable.h" 91 #include "components/pref_registry/pref_registry_syncable.h"
91 #include "components/rappor/rappor_service.h" 92 #include "components/rappor/rappor_service.h"
92 #include "components/search_engines/template_url_prepopulate_data.h" 93 #include "components/search_engines/template_url_prepopulate_data.h"
93 #include "components/sync_driver/sync_prefs.h" 94 #include "components/sync_driver/sync_prefs.h"
94 #include "components/translate/core/browser/translate_prefs.h" 95 #include "components/translate/core/browser/translate_prefs.h"
95 #include "content/public/browser/render_process_host.h" 96 #include "content/public/browser/render_process_host.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 PluginsResourceService::RegisterPrefs(registry); 286 PluginsResourceService::RegisterPrefs(registry);
286 #endif 287 #endif
287 288
288 #if defined(ENABLE_TASK_MANAGER) 289 #if defined(ENABLE_TASK_MANAGER)
289 TaskManager::RegisterPrefs(registry); 290 TaskManager::RegisterPrefs(registry);
290 #endif // defined(ENABLE_TASK_MANAGER) 291 #endif // defined(ENABLE_TASK_MANAGER)
291 292
292 #if !defined(OS_ANDROID) 293 #if !defined(OS_ANDROID)
293 BackgroundModeManager::RegisterPrefs(registry); 294 BackgroundModeManager::RegisterPrefs(registry);
294 RegisterBrowserPrefs(registry); 295 RegisterBrowserPrefs(registry);
296 // The native GCM is used on Android instead.
297 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
295 #if !defined(OS_CHROMEOS) 298 #if !defined(OS_CHROMEOS)
296 RegisterDefaultBrowserPromptPrefs(registry); 299 RegisterDefaultBrowserPromptPrefs(registry);
297 #endif // !defined(OS_CHROMEOS) 300 #endif // !defined(OS_CHROMEOS)
298 #endif // !defined(OS_ANDROID) 301 #endif // !defined(OS_ANDROID)
299 302
300 #if defined(OS_CHROMEOS) 303 #if defined(OS_CHROMEOS)
301 ChromeOSMetricsProvider::RegisterPrefs(registry); 304 ChromeOSMetricsProvider::RegisterPrefs(registry);
302 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 305 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
303 chromeos::ChargerReplacementHandler::RegisterPrefs(registry); 306 chromeos::ChargerReplacementHandler::RegisterPrefs(registry);
304 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); 307 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry);
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 #else 438 #else
436 AppShortcutManager::RegisterProfilePrefs(registry); 439 AppShortcutManager::RegisterProfilePrefs(registry);
437 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); 440 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
438 DeviceIDFetcher::RegisterProfilePrefs(registry); 441 DeviceIDFetcher::RegisterProfilePrefs(registry);
439 DevToolsWindow::RegisterProfilePrefs(registry); 442 DevToolsWindow::RegisterProfilePrefs(registry);
440 DriveAppMapping::RegisterProfilePrefs(registry); 443 DriveAppMapping::RegisterProfilePrefs(registry);
441 extensions::CommandService::RegisterProfilePrefs(registry); 444 extensions::CommandService::RegisterProfilePrefs(registry);
442 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 445 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
443 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 446 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
444 first_run::RegisterProfilePrefs(registry); 447 first_run::RegisterProfilePrefs(registry);
448 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
445 NewTabUI::RegisterProfilePrefs(registry); 449 NewTabUI::RegisterProfilePrefs(registry);
446 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 450 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
447 PinnedTabCodec::RegisterProfilePrefs(registry); 451 PinnedTabCodec::RegisterProfilePrefs(registry);
448 PluginsUI::RegisterProfilePrefs(registry); 452 PluginsUI::RegisterProfilePrefs(registry);
449 RegisterAutolaunchUserPrefs(registry); 453 RegisterAutolaunchUserPrefs(registry);
450 signin::RegisterProfilePrefs(registry); 454 signin::RegisterProfilePrefs(registry);
451 #endif 455 #endif
452 456
453 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 457 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
454 default_apps::RegisterProfilePrefs(registry); 458 default_apps::RegisterProfilePrefs(registry);
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 #if defined(OS_CHROMEOS) 613 #if defined(OS_CHROMEOS)
610 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 614 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
611 #endif 615 #endif
612 616
613 #if defined(TOOLKIT_VIEWS) 617 #if defined(TOOLKIT_VIEWS)
614 MigrateBrowserTabStripPrefs(local_state); 618 MigrateBrowserTabStripPrefs(local_state);
615 #endif 619 #endif
616 } 620 }
617 621
618 } // namespace chrome 622 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698