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

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: Fix CrOS test failures 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
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "chrome/browser/ui/webui/instant_ui.h" 75 #include "chrome/browser/ui/webui/instant_ui.h"
76 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 76 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
77 #include "chrome/browser/ui/webui/plugins_ui.h" 77 #include "chrome/browser/ui/webui/plugins_ui.h"
78 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 78 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
79 #include "chrome/browser/upgrade_detector.h" 79 #include "chrome/browser/upgrade_detector.h"
80 #include "chrome/browser/web_resource/promo_resource_service.h" 80 #include "chrome/browser/web_resource/promo_resource_service.h"
81 #include "chrome/common/pref_names.h" 81 #include "chrome/common/pref_names.h"
82 #include "components/autofill/core/browser/autofill_manager.h" 82 #include "components/autofill/core/browser/autofill_manager.h"
83 #include "components/bookmarks/browser/bookmark_utils.h" 83 #include "components/bookmarks/browser/bookmark_utils.h"
84 #include "components/dom_distiller/core/distilled_page_prefs.h" 84 #include "components/dom_distiller/core/distilled_page_prefs.h"
85 #include "components/gcm_driver/gcm_channel_status_syncer.h"
85 #include "components/google/core/browser/google_pref_names.h" 86 #include "components/google/core/browser/google_pref_names.h"
86 #include "components/google/core/browser/google_url_tracker.h" 87 #include "components/google/core/browser/google_url_tracker.h"
87 #include "components/network_time/network_time_tracker.h" 88 #include "components/network_time/network_time_tracker.h"
88 #include "components/password_manager/core/browser/password_manager.h" 89 #include "components/password_manager/core/browser/password_manager.h"
89 #include "components/pref_registry/pref_registry_syncable.h" 90 #include "components/pref_registry/pref_registry_syncable.h"
90 #include "components/rappor/rappor_service.h" 91 #include "components/rappor/rappor_service.h"
91 #include "components/search_engines/template_url_prepopulate_data.h" 92 #include "components/search_engines/template_url_prepopulate_data.h"
92 #include "components/sync_driver/sync_prefs.h" 93 #include "components/sync_driver/sync_prefs.h"
93 #include "components/translate/core/browser/translate_prefs.h" 94 #include "components/translate/core/browser/translate_prefs.h"
94 #include "content/public/browser/render_process_host.h" 95 #include "content/public/browser/render_process_host.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 AutomaticProfileResetterFactory::RegisterPrefs(registry); 294 AutomaticProfileResetterFactory::RegisterPrefs(registry);
294 BackgroundModeManager::RegisterPrefs(registry); 295 BackgroundModeManager::RegisterPrefs(registry);
295 RegisterBrowserPrefs(registry); 296 RegisterBrowserPrefs(registry);
297 // The native GCM is used on Android instead.
298 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
296 #if !defined(OS_CHROMEOS) 299 #if !defined(OS_CHROMEOS)
297 RegisterDefaultBrowserPromptPrefs(registry); 300 RegisterDefaultBrowserPromptPrefs(registry);
298 #endif // !defined(OS_CHROMEOS) 301 #endif // !defined(OS_CHROMEOS)
299 #endif // !defined(OS_ANDROID) 302 #endif // !defined(OS_ANDROID)
300 303
301 #if defined(OS_CHROMEOS) 304 #if defined(OS_CHROMEOS)
302 ChromeOSMetricsProvider::RegisterPrefs(registry); 305 ChromeOSMetricsProvider::RegisterPrefs(registry);
303 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 306 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
304 chromeos::ChargerReplacementHandler::RegisterPrefs(registry); 307 chromeos::ChargerReplacementHandler::RegisterPrefs(registry);
305 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); 308 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry);
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 #else 439 #else
437 AppShortcutManager::RegisterProfilePrefs(registry); 440 AppShortcutManager::RegisterProfilePrefs(registry);
438 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); 441 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
439 DeviceIDFetcher::RegisterProfilePrefs(registry); 442 DeviceIDFetcher::RegisterProfilePrefs(registry);
440 DevToolsWindow::RegisterProfilePrefs(registry); 443 DevToolsWindow::RegisterProfilePrefs(registry);
441 DriveAppMapping::RegisterProfilePrefs(registry); 444 DriveAppMapping::RegisterProfilePrefs(registry);
442 extensions::CommandService::RegisterProfilePrefs(registry); 445 extensions::CommandService::RegisterProfilePrefs(registry);
443 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 446 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
444 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 447 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
445 first_run::RegisterProfilePrefs(registry); 448 first_run::RegisterProfilePrefs(registry);
449 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
446 NewTabUI::RegisterProfilePrefs(registry); 450 NewTabUI::RegisterProfilePrefs(registry);
447 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 451 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
448 PinnedTabCodec::RegisterProfilePrefs(registry); 452 PinnedTabCodec::RegisterProfilePrefs(registry);
449 PluginsUI::RegisterProfilePrefs(registry); 453 PluginsUI::RegisterProfilePrefs(registry);
450 RegisterAutolaunchUserPrefs(registry); 454 RegisterAutolaunchUserPrefs(registry);
451 signin::RegisterProfilePrefs(registry); 455 signin::RegisterProfilePrefs(registry);
452 #endif 456 #endif
453 457
454 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 458 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
455 default_apps::RegisterProfilePrefs(registry); 459 default_apps::RegisterProfilePrefs(registry);
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 #if defined(OS_CHROMEOS) 614 #if defined(OS_CHROMEOS)
611 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 615 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
612 #endif 616 #endif
613 617
614 #if defined(TOOLKIT_VIEWS) 618 #if defined(TOOLKIT_VIEWS)
615 MigrateBrowserTabStripPrefs(local_state); 619 MigrateBrowserTabStripPrefs(local_state);
616 #endif 620 #endif
617 } 621 }
618 622
619 } // namespace chrome 623 } // namespace chrome
OLDNEW
« 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