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

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

Issue 137623011: Switch to using the new Link Doctor API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove bonus line from a merge conflict Created 6 years, 10 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "chrome/browser/profiles/profiles_state.h" 66 #include "chrome/browser/profiles/profiles_state.h"
67 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" 67 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
68 #include "chrome/browser/renderer_host/web_cache_manager.h" 68 #include "chrome/browser/renderer_host/web_cache_manager.h"
69 #include "chrome/browser/search/search.h" 69 #include "chrome/browser/search/search.h"
70 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 70 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
71 #include "chrome/browser/services/gcm/gcm_profile_service.h" 71 #include "chrome/browser/services/gcm/gcm_profile_service.h"
72 #include "chrome/browser/signin/signin_manager_factory.h" 72 #include "chrome/browser/signin/signin_manager_factory.h"
73 #include "chrome/browser/signin/signin_promo.h" 73 #include "chrome/browser/signin/signin_promo.h"
74 #include "chrome/browser/sync/sync_prefs.h" 74 #include "chrome/browser/sync/sync_prefs.h"
75 #include "chrome/browser/task_manager/task_manager.h" 75 #include "chrome/browser/task_manager/task_manager.h"
76 #include "chrome/browser/ui/alternate_error_tab_observer.h"
77 #include "chrome/browser/ui/app_list/app_list_service.h" 76 #include "chrome/browser/ui/app_list/app_list_service.h"
78 #include "chrome/browser/ui/browser_ui_prefs.h" 77 #include "chrome/browser/ui/browser_ui_prefs.h"
78 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
79 #include "chrome/browser/ui/network_profile_bubble.h" 79 #include "chrome/browser/ui/network_profile_bubble.h"
80 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 80 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
81 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 81 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
82 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 82 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
83 #include "chrome/browser/ui/startup/default_browser_prompt.h" 83 #include "chrome/browser/ui/startup/default_browser_prompt.h"
84 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 84 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
85 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 85 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
86 #include "chrome/browser/ui/webui/flags_ui.h" 86 #include "chrome/browser/ui/webui/flags_ui.h"
87 #include "chrome/browser/ui/webui/instant_ui.h" 87 #include "chrome/browser/ui/webui/instant_ui.h"
88 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 88 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 #if defined(TOOLKIT_VIEWS) 328 #if defined(TOOLKIT_VIEWS)
329 RegisterBrowserViewLocalPrefs(registry); 329 RegisterBrowserViewLocalPrefs(registry);
330 RegisterTabStripLayoutTypePrefs(registry); 330 RegisterTabStripLayoutTypePrefs(registry);
331 #endif 331 #endif
332 } 332 }
333 333
334 // Register prefs applicable to all profiles. 334 // Register prefs applicable to all profiles.
335 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 335 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
336 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); 336 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
337 // User prefs. Please keep this list alphabetized. 337 // User prefs. Please keep this list alphabetized.
338 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry);
339 apps::RegisterProfilePrefs(registry); 338 apps::RegisterProfilePrefs(registry);
340 autofill::AutofillManager::RegisterProfilePrefs(registry); 339 autofill::AutofillManager::RegisterProfilePrefs(registry);
341 BookmarkPromptPrefs::RegisterProfilePrefs(registry); 340 BookmarkPromptPrefs::RegisterProfilePrefs(registry);
342 bookmark_utils::RegisterProfilePrefs(registry); 341 bookmark_utils::RegisterProfilePrefs(registry);
343 browser_sync::SyncPrefs::RegisterProfilePrefs(registry); 342 browser_sync::SyncPrefs::RegisterProfilePrefs(registry);
344 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 343 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
345 ChromeVersionService::RegisterProfilePrefs(registry); 344 ChromeVersionService::RegisterProfilePrefs(registry);
346 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( 345 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs(
347 registry); 346 registry);
348 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 347 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
349 DownloadPrefs::RegisterProfilePrefs(registry); 348 DownloadPrefs::RegisterProfilePrefs(registry);
350 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 349 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
351 extensions::launch_util::RegisterProfilePrefs(registry); 350 extensions::launch_util::RegisterProfilePrefs(registry);
352 ExtensionWebUI::RegisterProfilePrefs(registry); 351 ExtensionWebUI::RegisterProfilePrefs(registry);
353 HostContentSettingsMap::RegisterProfilePrefs(registry); 352 HostContentSettingsMap::RegisterProfilePrefs(registry);
354 IncognitoModePrefs::RegisterProfilePrefs(registry); 353 IncognitoModePrefs::RegisterProfilePrefs(registry);
355 InstantUI::RegisterProfilePrefs(registry); 354 InstantUI::RegisterProfilePrefs(registry);
355 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
356 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 356 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
357 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 357 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
358 MediaStreamDevicesController::RegisterProfilePrefs(registry); 358 MediaStreamDevicesController::RegisterProfilePrefs(registry);
359 NetPrefObserver::RegisterProfilePrefs(registry); 359 NetPrefObserver::RegisterProfilePrefs(registry);
360 NetworkTimeService::RegisterProfilePrefs(registry); 360 NetworkTimeService::RegisterProfilePrefs(registry);
361 NewTabUI::RegisterProfilePrefs(registry); 361 NewTabUI::RegisterProfilePrefs(registry);
362 PasswordManager::RegisterProfilePrefs(registry); 362 PasswordManager::RegisterProfilePrefs(registry);
363 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 363 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
364 PrefsTabHelper::RegisterProfilePrefs(registry); 364 PrefsTabHelper::RegisterProfilePrefs(registry);
365 Profile::RegisterProfilePrefs(registry); 365 Profile::RegisterProfilePrefs(registry);
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 577 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
578 current_version); 578 current_version);
579 } 579 }
580 580
581 #if defined(OS_CHROMEOS) 581 #if defined(OS_CHROMEOS)
582 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 582 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
583 #endif 583 #endif
584 } 584 }
585 585
586 } // namespace chrome 586 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/net/url_request_mock_util.cc ('k') | chrome/browser/ui/alternate_error_tab_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698