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

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

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 #endif 454 #endif
455 } 455 }
456 456
457 // Register prefs applicable to all profiles. 457 // Register prefs applicable to all profiles.
458 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 458 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
459 TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs"); 459 TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs");
460 SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime"); 460 SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime");
461 // User prefs. Please keep this list alphabetized. 461 // User prefs. Please keep this list alphabetized.
462 autofill::AutofillManager::RegisterProfilePrefs(registry); 462 autofill::AutofillManager::RegisterProfilePrefs(registry);
463 BudgetManager::RegisterProfilePrefs(registry); 463 BudgetManager::RegisterProfilePrefs(registry);
464 syncer::SyncPrefs::RegisterProfilePrefs(registry); 464 sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
465 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 465 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
466 ChromeVersionService::RegisterProfilePrefs(registry); 466 ChromeVersionService::RegisterProfilePrefs(registry);
467 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( 467 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs(
468 registry); 468 registry);
469 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 469 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
470 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); 470 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry);
471 chrome_prefs::RegisterProfilePrefs(registry); 471 chrome_prefs::RegisterProfilePrefs(registry);
472 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); 472 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry);
473 DownloadPrefs::RegisterProfilePrefs(registry); 473 DownloadPrefs::RegisterProfilePrefs(registry);
474 HostContentSettingsMap::RegisterProfilePrefs(registry); 474 HostContentSettingsMap::RegisterProfilePrefs(registry);
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 // Added 8/2016. 771 // Added 8/2016.
772 profile_prefs->ClearPref(kStaticEncodings); 772 profile_prefs->ClearPref(kStaticEncodings);
773 profile_prefs->ClearPref(kRecentlySelectedEncoding); 773 profile_prefs->ClearPref(kRecentlySelectedEncoding);
774 774
775 // Added 9/2016. 775 // Added 9/2016.
776 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 776 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
777 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 777 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
778 } 778 }
779 779
780 } // namespace chrome 780 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_list_factory.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698