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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService"" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/
Patch Set: Created 7 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
« no previous file with comments | « chrome/browser/invalidation/ticl_invalidation_service_unittest.cc ('k') | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('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 "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 15 matching lines...) Expand all
26 #include "chrome/browser/extensions/extension_prefs.h" 26 #include "chrome/browser/extensions/extension_prefs.h"
27 #include "chrome/browser/extensions/extension_web_ui.h" 27 #include "chrome/browser/extensions/extension_web_ui.h"
28 #include "chrome/browser/external_protocol/external_protocol_handler.h" 28 #include "chrome/browser/external_protocol/external_protocol_handler.h"
29 #include "chrome/browser/first_run/first_run.h" 29 #include "chrome/browser/first_run/first_run.h"
30 #include "chrome/browser/geolocation/geolocation_prefs.h" 30 #include "chrome/browser/geolocation/geolocation_prefs.h"
31 #include "chrome/browser/google/google_url_tracker.h" 31 #include "chrome/browser/google/google_url_tracker.h"
32 #include "chrome/browser/google/google_url_tracker_factory.h" 32 #include "chrome/browser/google/google_url_tracker_factory.h"
33 #include "chrome/browser/gpu/gl_string_manager.h" 33 #include "chrome/browser/gpu/gl_string_manager.h"
34 #include "chrome/browser/gpu/gpu_mode_manager.h" 34 #include "chrome/browser/gpu/gpu_mode_manager.h"
35 #include "chrome/browser/intranet_redirect_detector.h" 35 #include "chrome/browser/intranet_redirect_detector.h"
36 #include "chrome/browser/invalidation/invalidator_storage.h"
36 #include "chrome/browser/io_thread.h" 37 #include "chrome/browser/io_thread.h"
37 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 38 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
38 #include "chrome/browser/media/media_stream_devices_controller.h" 39 #include "chrome/browser/media/media_stream_devices_controller.h"
39 #include "chrome/browser/metrics/metrics_log.h" 40 #include "chrome/browser/metrics/metrics_log.h"
40 #include "chrome/browser/metrics/metrics_service.h" 41 #include "chrome/browser/metrics/metrics_service.h"
41 #include "chrome/browser/metrics/variations/variations_service.h" 42 #include "chrome/browser/metrics/variations/variations_service.h"
42 #include "chrome/browser/net/http_server_properties_manager.h" 43 #include "chrome/browser/net/http_server_properties_manager.h"
43 #include "chrome/browser/net/net_pref_observer.h" 44 #include "chrome/browser/net/net_pref_observer.h"
44 #include "chrome/browser/net/predictor.h" 45 #include "chrome/browser/net/predictor.h"
45 #include "chrome/browser/net/ssl_config_service_manager.h" 46 #include "chrome/browser/net/ssl_config_service_manager.h"
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( 296 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs(
296 registry); 297 registry);
297 chrome_browser_net::Predictor::RegisterUserPrefs(registry); 298 chrome_browser_net::Predictor::RegisterUserPrefs(registry);
298 DownloadPrefs::RegisterUserPrefs(registry); 299 DownloadPrefs::RegisterUserPrefs(registry);
299 extensions::ExtensionPrefs::RegisterUserPrefs(registry); 300 extensions::ExtensionPrefs::RegisterUserPrefs(registry);
300 ExtensionWebUI::RegisterUserPrefs(registry); 301 ExtensionWebUI::RegisterUserPrefs(registry);
301 first_run::RegisterUserPrefs(registry); 302 first_run::RegisterUserPrefs(registry);
302 HostContentSettingsMap::RegisterUserPrefs(registry); 303 HostContentSettingsMap::RegisterUserPrefs(registry);
303 IncognitoModePrefs::RegisterUserPrefs(registry); 304 IncognitoModePrefs::RegisterUserPrefs(registry);
304 InstantUI::RegisterUserPrefs(registry); 305 InstantUI::RegisterUserPrefs(registry);
306 invalidation::InvalidatorStorage::RegisterUserPrefs(registry);
305 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); 307 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry);
306 MediaStreamDevicesController::RegisterUserPrefs(registry); 308 MediaStreamDevicesController::RegisterUserPrefs(registry);
307 NetPrefObserver::RegisterUserPrefs(registry); 309 NetPrefObserver::RegisterUserPrefs(registry);
308 NewTabUI::RegisterUserPrefs(registry); 310 NewTabUI::RegisterUserPrefs(registry);
309 PasswordGenerationManager::RegisterUserPrefs(registry); 311 PasswordGenerationManager::RegisterUserPrefs(registry);
310 PasswordManager::RegisterUserPrefs(registry); 312 PasswordManager::RegisterUserPrefs(registry);
311 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); 313 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry);
312 PrefsTabHelper::RegisterUserPrefs(registry); 314 PrefsTabHelper::RegisterUserPrefs(registry);
313 Profile::RegisterUserPrefs(registry); 315 Profile::RegisterUserPrefs(registry);
314 ProfileImpl::RegisterUserPrefs(registry); 316 ProfileImpl::RegisterUserPrefs(registry);
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 } 466 }
465 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 467 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
466 468
467 current_version |= GOOGLE_URL_TRACKER_PREFS; 469 current_version |= GOOGLE_URL_TRACKER_PREFS;
468 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 470 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
469 current_version); 471 current_version);
470 } 472 }
471 } 473 }
472 474
473 } // namespace chrome 475 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/invalidation/ticl_invalidation_service_unittest.cc ('k') | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698