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

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

Issue 5921003: Revert 69320 - Migrate HostReferralList and StartupDNSPrefetchList from local... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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/net/predictor_api.cc ('k') | chrome/browser/prefs/pref_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background_contents_service.h" 9 #include "chrome/browser/background_contents_service.h"
10 #include "chrome/browser/background_mode_manager.h" 10 #include "chrome/browser/background_mode_manager.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 Browser::RegisterPrefs(local_state); 85 Browser::RegisterPrefs(local_state);
86 WebCacheManager::RegisterPrefs(local_state); 86 WebCacheManager::RegisterPrefs(local_state);
87 ExternalProtocolHandler::RegisterPrefs(local_state); 87 ExternalProtocolHandler::RegisterPrefs(local_state);
88 GoogleURLTracker::RegisterPrefs(local_state); 88 GoogleURLTracker::RegisterPrefs(local_state);
89 IntranetRedirectDetector::RegisterPrefs(local_state); 89 IntranetRedirectDetector::RegisterPrefs(local_state);
90 KeywordEditorController::RegisterPrefs(local_state); 90 KeywordEditorController::RegisterPrefs(local_state);
91 MetricsLog::RegisterPrefs(local_state); 91 MetricsLog::RegisterPrefs(local_state);
92 MetricsService::RegisterPrefs(local_state); 92 MetricsService::RegisterPrefs(local_state);
93 SafeBrowsingService::RegisterPrefs(local_state); 93 SafeBrowsingService::RegisterPrefs(local_state);
94 browser_shutdown::RegisterPrefs(local_state); 94 browser_shutdown::RegisterPrefs(local_state);
95 chrome_browser_net::RegisterPrefs(local_state);
95 #if defined(TOOLKIT_VIEWS) 96 #if defined(TOOLKIT_VIEWS)
96 BrowserView::RegisterBrowserViewPrefs(local_state); 97 BrowserView::RegisterBrowserViewPrefs(local_state);
97 #endif 98 #endif
98 UpgradeDetector::RegisterPrefs(local_state); 99 UpgradeDetector::RegisterPrefs(local_state);
99 TaskManager::RegisterPrefs(local_state); 100 TaskManager::RegisterPrefs(local_state);
100 geolocation::RegisterPrefs(local_state); 101 geolocation::RegisterPrefs(local_state);
101 AutoFillManager::RegisterBrowserPrefs(local_state); 102 AutoFillManager::RegisterBrowserPrefs(local_state);
102 BackgroundPageTracker::RegisterPrefs(local_state); 103 BackgroundPageTracker::RegisterPrefs(local_state);
103 #if defined(OS_CHROMEOS) 104 #if defined(OS_CHROMEOS)
104 chromeos::UserManager::RegisterPrefs(local_state); 105 chromeos::UserManager::RegisterPrefs(local_state);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 chromeos::Preferences::RegisterUserPrefs(user_prefs); 148 chromeos::Preferences::RegisterUserPrefs(user_prefs);
148 #endif 149 #endif
149 BackgroundContentsService::RegisterUserPrefs(user_prefs); 150 BackgroundContentsService::RegisterUserPrefs(user_prefs);
150 SigninManager::RegisterUserPrefs(user_prefs); 151 SigninManager::RegisterUserPrefs(user_prefs);
151 TemplateURLModel::RegisterUserPrefs(user_prefs); 152 TemplateURLModel::RegisterUserPrefs(user_prefs);
152 InstantController::RegisterUserPrefs(user_prefs); 153 InstantController::RegisterUserPrefs(user_prefs);
153 NetPrefObserver::RegisterPrefs(user_prefs); 154 NetPrefObserver::RegisterPrefs(user_prefs);
154 } 155 }
155 156
156 } // namespace browser 157 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/net/predictor_api.cc ('k') | chrome/browser/prefs/pref_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698