OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
11 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
12 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
13 #include "chrome/browser/browser_shutdown.h" | 13 #include "chrome/browser/browser_shutdown.h" |
14 #include "chrome/browser/content_settings/host_content_settings_map.h" | 14 #include "chrome/browser/content_settings/host_content_settings_map.h" |
15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
16 #include "chrome/browser/debugger/devtools_window.h" | 16 #include "chrome/browser/debugger/devtools_window.h" |
17 #include "chrome/browser/download/download_prefs.h" | 17 #include "chrome/browser/download/download_prefs.h" |
18 #include "chrome/browser/extensions/api/commands/extension_command_service.h" | 18 #include "chrome/browser/extensions/api/commands/command_service.h" |
19 #include "chrome/browser/extensions/apps_promo.h" | 19 #include "chrome/browser/extensions/apps_promo.h" |
20 #include "chrome/browser/extensions/component_loader.h" | 20 #include "chrome/browser/extensions/component_loader.h" |
21 #include "chrome/browser/extensions/extension_prefs.h" | 21 #include "chrome/browser/extensions/extension_prefs.h" |
22 #include "chrome/browser/extensions/extension_web_ui.h" | 22 #include "chrome/browser/extensions/extension_web_ui.h" |
23 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 23 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
24 #include "chrome/browser/geolocation/geolocation_prefs.h" | 24 #include "chrome/browser/geolocation/geolocation_prefs.h" |
25 #include "chrome/browser/google/google_url_tracker.h" | 25 #include "chrome/browser/google/google_url_tracker.h" |
26 #include "chrome/browser/google/google_url_tracker_factory.h" | 26 #include "chrome/browser/google/google_url_tracker_factory.h" |
27 #include "chrome/browser/instant/instant_controller.h" | 27 #include "chrome/browser/instant/instant_controller.h" |
28 #include "chrome/browser/intents/web_intents_util.h" | 28 #include "chrome/browser/intents/web_intents_util.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 // User prefs | 171 // User prefs |
172 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); | 172 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); |
173 AppsPromo::RegisterUserPrefs(user_prefs); | 173 AppsPromo::RegisterUserPrefs(user_prefs); |
174 AutofillManager::RegisterUserPrefs(user_prefs); | 174 AutofillManager::RegisterUserPrefs(user_prefs); |
175 bookmark_utils::RegisterUserPrefs(user_prefs); | 175 bookmark_utils::RegisterUserPrefs(user_prefs); |
176 BookmarkModel::RegisterUserPrefs(user_prefs); | 176 BookmarkModel::RegisterUserPrefs(user_prefs); |
177 ChromeVersionService::RegisterUserPrefs(user_prefs); | 177 ChromeVersionService::RegisterUserPrefs(user_prefs); |
178 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); | 178 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); |
179 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); | 179 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); |
180 DownloadPrefs::RegisterUserPrefs(user_prefs); | 180 DownloadPrefs::RegisterUserPrefs(user_prefs); |
| 181 extensions::CommandService::RegisterUserPrefs(user_prefs); |
181 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 182 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
182 extensions::ExtensionCommandService::RegisterUserPrefs(user_prefs); | |
183 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 183 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
184 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 184 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
185 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 185 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
186 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); | 186 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); |
187 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 187 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
188 IncognitoModePrefs::RegisterUserPrefs(user_prefs); | 188 IncognitoModePrefs::RegisterUserPrefs(user_prefs); |
189 InstantController::RegisterUserPrefs(user_prefs); | 189 InstantController::RegisterUserPrefs(user_prefs); |
190 NetPrefObserver::RegisterPrefs(user_prefs); | 190 NetPrefObserver::RegisterPrefs(user_prefs); |
191 NewTabUI::RegisterUserPrefs(user_prefs); | 191 NewTabUI::RegisterUserPrefs(user_prefs); |
192 PasswordManager::RegisterUserPrefs(user_prefs); | 192 PasswordManager::RegisterUserPrefs(user_prefs); |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 } | 303 } |
304 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 304 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
305 | 305 |
306 current_version |= GOOGLE_URL_TRACKER_PREFS; | 306 current_version |= GOOGLE_URL_TRACKER_PREFS; |
307 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 307 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
308 current_version); | 308 current_version); |
309 } | 309 } |
310 } | 310 } |
311 | 311 |
312 } // namespace browser | 312 } // namespace browser |
OLD | NEW |