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

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: Add missing file, fix test 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/renderer_host/pepper/device_id_fetcher.h" 66 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
67 #include "chrome/browser/renderer_host/web_cache_manager.h" 67 #include "chrome/browser/renderer_host/web_cache_manager.h"
68 #include "chrome/browser/search/search.h" 68 #include "chrome/browser/search/search.h"
69 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 69 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
70 #include "chrome/browser/services/gcm/gcm_profile_service.h" 70 #include "chrome/browser/services/gcm/gcm_profile_service.h"
71 #include "chrome/browser/signin/signin_manager_factory.h" 71 #include "chrome/browser/signin/signin_manager_factory.h"
72 #include "chrome/browser/signin/signin_promo.h" 72 #include "chrome/browser/signin/signin_promo.h"
73 #include "chrome/browser/sync/sync_prefs.h" 73 #include "chrome/browser/sync/sync_prefs.h"
74 #include "chrome/browser/task_manager/task_manager.h" 74 #include "chrome/browser/task_manager/task_manager.h"
75 #include "chrome/browser/translate/translate_prefs.h" 75 #include "chrome/browser/translate/translate_prefs.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/link_doctor_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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 #if defined(TOOLKIT_VIEWS) 323 #if defined(TOOLKIT_VIEWS)
324 RegisterBrowserViewPrefs(registry); 324 RegisterBrowserViewPrefs(registry);
325 RegisterTabStripLayoutTypePrefs(registry); 325 RegisterTabStripLayoutTypePrefs(registry);
326 #endif 326 #endif
327 } 327 }
328 328
329 // Register prefs applicable to all profiles. 329 // Register prefs applicable to all profiles.
330 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 330 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
331 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); 331 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
332 // User prefs. Please keep this list alphabetized. 332 // User prefs. Please keep this list alphabetized.
333 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry); 333 LinkDoctorTabObserver::RegisterProfilePrefs(registry);
Deprecated (see juliatuttle) 2014/02/08 01:51:31 nit: Re-alphabetize.
mmenke 2014/02/08 01:57:49 Done, thanks! Completely missed the comment.
334 apps::RegisterProfilePrefs(registry); 334 apps::RegisterProfilePrefs(registry);
335 autofill::AutofillManager::RegisterProfilePrefs(registry); 335 autofill::AutofillManager::RegisterProfilePrefs(registry);
336 BookmarkPromptPrefs::RegisterProfilePrefs(registry); 336 BookmarkPromptPrefs::RegisterProfilePrefs(registry);
337 bookmark_utils::RegisterProfilePrefs(registry); 337 bookmark_utils::RegisterProfilePrefs(registry);
338 browser_sync::SyncPrefs::RegisterProfilePrefs(registry); 338 browser_sync::SyncPrefs::RegisterProfilePrefs(registry);
339 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 339 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
340 ChromeVersionService::RegisterProfilePrefs(registry); 340 ChromeVersionService::RegisterProfilePrefs(registry);
341 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( 341 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs(
342 registry); 342 registry);
343 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 343 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
570 current_version); 570 current_version);
571 } 571 }
572 572
573 #if defined(OS_CHROMEOS) 573 #if defined(OS_CHROMEOS)
574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
575 #endif 575 #endif
576 } 576 }
577 577
578 } // namespace chrome 578 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698