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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 291333009: network_time: Remove NetworkTimeService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 6 years, 6 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 | Annotate | Revision Log
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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 27 matching lines...) Expand all
38 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 38 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
39 #include "chrome/browser/media/media_device_id_salt.h" 39 #include "chrome/browser/media/media_device_id_salt.h"
40 #include "chrome/browser/media/media_stream_devices_controller.h" 40 #include "chrome/browser/media/media_stream_devices_controller.h"
41 #include "chrome/browser/metrics/metrics_service.h" 41 #include "chrome/browser/metrics/metrics_service.h"
42 #include "chrome/browser/metrics/variations/variations_service.h" 42 #include "chrome/browser/metrics/variations/variations_service.h"
43 #include "chrome/browser/net/http_server_properties_manager.h" 43 #include "chrome/browser/net/http_server_properties_manager.h"
44 #include "chrome/browser/net/net_pref_observer.h" 44 #include "chrome/browser/net/net_pref_observer.h"
45 #include "chrome/browser/net/predictor.h" 45 #include "chrome/browser/net/predictor.h"
46 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" 46 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
47 #include "chrome/browser/net/ssl_config_service_manager.h" 47 #include "chrome/browser/net/ssl_config_service_manager.h"
48 #include "chrome/browser/network_time/network_time_service.h" 48 #include "chrome/browser/network_time/network_time_tracker.h"
49 #include "chrome/browser/notifications/desktop_notification_service.h" 49 #include "chrome/browser/notifications/desktop_notification_service.h"
50 #include "chrome/browser/notifications/message_center_notification_manager.h" 50 #include "chrome/browser/notifications/message_center_notification_manager.h"
51 #include "chrome/browser/pepper_flash_settings_manager.h" 51 #include "chrome/browser/pepper_flash_settings_manager.h"
52 #include "chrome/browser/plugins/plugin_finder.h" 52 #include "chrome/browser/plugins/plugin_finder.h"
53 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 53 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
54 #include "chrome/browser/prefs/incognito_mode_prefs.h" 54 #include "chrome/browser/prefs/incognito_mode_prefs.h"
55 #include "chrome/browser/prefs/pref_service_syncable.h" 55 #include "chrome/browser/prefs/pref_service_syncable.h"
56 #include "chrome/browser/prefs/session_startup_pref.h" 56 #include "chrome/browser/prefs/session_startup_pref.h"
57 #include "chrome/browser/printing/print_dialog_cloud.h" 57 #include "chrome/browser/printing/print_dialog_cloud.h"
58 #include "chrome/browser/profiles/chrome_version_service.h" 58 #include "chrome/browser/profiles/chrome_version_service.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 component_updater::RegisterPrefsForRecoveryComponent(registry); 227 component_updater::RegisterPrefsForRecoveryComponent(registry);
228 ExternalProtocolHandler::RegisterPrefs(registry); 228 ExternalProtocolHandler::RegisterPrefs(registry);
229 FlagsUI::RegisterPrefs(registry); 229 FlagsUI::RegisterPrefs(registry);
230 geolocation::RegisterPrefs(registry); 230 geolocation::RegisterPrefs(registry);
231 GLStringManager::RegisterPrefs(registry); 231 GLStringManager::RegisterPrefs(registry);
232 GpuModeManager::RegisterPrefs(registry); 232 GpuModeManager::RegisterPrefs(registry);
233 IntranetRedirectDetector::RegisterPrefs(registry); 233 IntranetRedirectDetector::RegisterPrefs(registry);
234 IOThread::RegisterPrefs(registry); 234 IOThread::RegisterPrefs(registry);
235 KeywordEditorController::RegisterPrefs(registry); 235 KeywordEditorController::RegisterPrefs(registry);
236 MetricsService::RegisterPrefs(registry); 236 MetricsService::RegisterPrefs(registry);
237 NetworkTimeTracker::RegisterPrefs(registry);
237 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); 238 PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
238 ProfileInfoCache::RegisterPrefs(registry); 239 ProfileInfoCache::RegisterPrefs(registry);
239 profiles::RegisterPrefs(registry); 240 profiles::RegisterPrefs(registry);
240 PromoResourceService::RegisterPrefs(registry); 241 PromoResourceService::RegisterPrefs(registry);
241 rappor::RapporService::RegisterPrefs(registry); 242 rappor::RapporService::RegisterPrefs(registry);
242 RegisterScreenshotPrefs(registry); 243 RegisterScreenshotPrefs(registry);
243 SigninManagerFactory::RegisterPrefs(registry); 244 SigninManagerFactory::RegisterPrefs(registry);
244 SSLConfigServiceManager::RegisterPrefs(registry); 245 SSLConfigServiceManager::RegisterPrefs(registry);
245 UpgradeDetector::RegisterPrefs(registry); 246 UpgradeDetector::RegisterPrefs(registry);
246 WebCacheManager::RegisterPrefs(registry); 247 WebCacheManager::RegisterPrefs(registry);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 extensions::launch_util::RegisterProfilePrefs(registry); 349 extensions::launch_util::RegisterProfilePrefs(registry);
349 ExtensionWebUI::RegisterProfilePrefs(registry); 350 ExtensionWebUI::RegisterProfilePrefs(registry);
350 HostContentSettingsMap::RegisterProfilePrefs(registry); 351 HostContentSettingsMap::RegisterProfilePrefs(registry);
351 IncognitoModePrefs::RegisterProfilePrefs(registry); 352 IncognitoModePrefs::RegisterProfilePrefs(registry);
352 InstantUI::RegisterProfilePrefs(registry); 353 InstantUI::RegisterProfilePrefs(registry);
353 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); 354 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
354 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 355 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
355 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 356 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
356 MediaStreamDevicesController::RegisterProfilePrefs(registry); 357 MediaStreamDevicesController::RegisterProfilePrefs(registry);
357 NetPrefObserver::RegisterProfilePrefs(registry); 358 NetPrefObserver::RegisterProfilePrefs(registry);
358 NetworkTimeService::RegisterProfilePrefs(registry);
359 359
360 password_manager::PasswordManager::RegisterProfilePrefs(registry); 360 password_manager::PasswordManager::RegisterProfilePrefs(registry);
361 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 361 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
362 PrefsTabHelper::RegisterProfilePrefs(registry); 362 PrefsTabHelper::RegisterProfilePrefs(registry);
363 Profile::RegisterProfilePrefs(registry); 363 Profile::RegisterProfilePrefs(registry);
364 ProfileImpl::RegisterProfilePrefs(registry); 364 ProfileImpl::RegisterProfilePrefs(registry);
365 PromoResourceService::RegisterProfilePrefs(registry); 365 PromoResourceService::RegisterProfilePrefs(registry);
366 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); 366 ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
367 RegisterBrowserUserPrefs(registry); 367 RegisterBrowserUserPrefs(registry);
368 SessionStartupPref::RegisterProfilePrefs(registry); 368 SessionStartupPref::RegisterProfilePrefs(registry);
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
574 current_version); 574 current_version);
575 } 575 }
576 576
577 #if defined(OS_CHROMEOS) 577 #if defined(OS_CHROMEOS)
578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
579 #endif 579 #endif
580 } 580 }
581 581
582 } // namespace chrome 582 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/network_time/network_time_tracker_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698