OLD | NEW |
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 Loading... |
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 Loading... |
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 |
OLD | NEW |