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

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

Issue 971383002: Removing FRE UI for unicorn accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed. Created 5 years, 9 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
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/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/printing/print_dialog_cloud.h" 52 #include "chrome/browser/printing/print_dialog_cloud.h"
53 #include "chrome/browser/profiles/chrome_version_service.h" 53 #include "chrome/browser/profiles/chrome_version_service.h"
54 #include "chrome/browser/profiles/profile.h" 54 #include "chrome/browser/profiles/profile.h"
55 #include "chrome/browser/profiles/profile_impl.h" 55 #include "chrome/browser/profiles/profile_impl.h"
56 #include "chrome/browser/profiles/profile_info_cache.h" 56 #include "chrome/browser/profiles/profile_info_cache.h"
57 #include "chrome/browser/profiles/profiles_state.h" 57 #include "chrome/browser/profiles/profiles_state.h"
58 #include "chrome/browser/push_messaging/push_messaging_service_impl.h" 58 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
59 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" 59 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
60 #include "chrome/browser/search/search.h" 60 #include "chrome/browser/search/search.h"
61 #include "chrome/browser/signin/signin_manager_factory.h" 61 #include "chrome/browser/signin/signin_manager_factory.h"
62 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
62 #include "chrome/browser/task_manager/task_manager.h" 63 #include "chrome/browser/task_manager/task_manager.h"
63 #include "chrome/browser/ui/app_list/app_list_prefs.h" 64 #include "chrome/browser/ui/app_list/app_list_prefs.h"
64 #include "chrome/browser/ui/app_list/app_list_service.h" 65 #include "chrome/browser/ui/app_list/app_list_service.h"
65 #include "chrome/browser/ui/browser_ui_prefs.h" 66 #include "chrome/browser/ui/browser_ui_prefs.h"
66 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 67 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
67 #include "chrome/browser/ui/network_profile_bubble.h" 68 #include "chrome/browser/ui/network_profile_bubble.h"
68 #include "chrome/browser/ui/passwords/password_bubble_experiment.h" 69 #include "chrome/browser/ui/passwords/password_bubble_experiment.h"
69 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 70 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
70 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 71 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
71 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 72 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 } 365 }
365 366
366 // Register prefs applicable to all profiles. 367 // Register prefs applicable to all profiles.
367 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 368 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
368 TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs"); 369 TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs");
369 SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime"); 370 SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime");
370 // User prefs. Please keep this list alphabetized. 371 // User prefs. Please keep this list alphabetized.
371 autofill::AutofillManager::RegisterProfilePrefs(registry); 372 autofill::AutofillManager::RegisterProfilePrefs(registry);
372 bookmarks::RegisterProfilePrefs(registry); 373 bookmarks::RegisterProfilePrefs(registry);
373 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); 374 sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
375 ChildAccountService::RegisterProfilePrefs(registry);
374 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 376 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
375 ChromeVersionService::RegisterProfilePrefs(registry); 377 ChromeVersionService::RegisterProfilePrefs(registry);
376 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( 378 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs(
377 registry); 379 registry);
378 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 380 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
379 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); 381 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry);
380 chrome_prefs::RegisterProfilePrefs(registry); 382 chrome_prefs::RegisterProfilePrefs(registry);
381 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); 383 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry);
382 DownloadPrefs::RegisterProfilePrefs(registry); 384 DownloadPrefs::RegisterProfilePrefs(registry);
383 enhanced_bookmarks::BookmarkServerClusterService::RegisterPrefs(registry); 385 enhanced_bookmarks::BookmarkServerClusterService::RegisterPrefs(registry);
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */); 623 host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);
622 624
623 // We're done migrating the profile per-host zoom level values, so we clear 625 // We're done migrating the profile per-host zoom level values, so we clear
624 // them all. 626 // them all.
625 DictionaryPrefUpdate host_zoom_dictionary_update( 627 DictionaryPrefUpdate host_zoom_dictionary_update(
626 prefs, prefs::kPerHostZoomLevelsDeprecated); 628 prefs, prefs::kPerHostZoomLevelsDeprecated);
627 host_zoom_dictionary_update->Clear(); 629 host_zoom_dictionary_update->Clear();
628 } 630 }
629 631
630 } // namespace chrome 632 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698