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" |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 #endif | 220 #endif |
221 | 221 |
222 #if defined(USE_ASH) | 222 #if defined(USE_ASH) |
223 ash::RegisterChromeLauncherUserPrefs(user_prefs); | 223 ash::RegisterChromeLauncherUserPrefs(user_prefs); |
224 #endif | 224 #endif |
225 | 225 |
226 #if !defined(OS_ANDROID) | 226 #if !defined(OS_ANDROID) |
227 AppsPromo::RegisterUserPrefs(user_prefs); | 227 AppsPromo::RegisterUserPrefs(user_prefs); |
228 extensions::CommandService::RegisterUserPrefs(user_prefs); | 228 extensions::CommandService::RegisterUserPrefs(user_prefs); |
229 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 229 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
230 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 230 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs); |
231 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 231 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
232 chrome::RegisterBrowserUserPrefs(user_prefs); | 232 chrome::RegisterBrowserUserPrefs(user_prefs); |
233 chrome::RegisterAutolaunchPrefs(user_prefs); | 233 chrome::RegisterAutolaunchPrefs(user_prefs); |
234 DevToolsWindow::RegisterUserPrefs(user_prefs); | 234 DevToolsWindow::RegisterUserPrefs(user_prefs); |
235 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); | 235 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); |
236 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 236 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
237 PluginsUI::RegisterUserPrefs(user_prefs); | 237 PluginsUI::RegisterUserPrefs(user_prefs); |
238 PromoResourceService::RegisterUserPrefs(user_prefs); | 238 PromoResourceService::RegisterUserPrefs(user_prefs); |
239 SyncPromoUI::RegisterUserPrefs(user_prefs); | 239 SyncPromoUI::RegisterUserPrefs(user_prefs); |
240 #endif | 240 #endif |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 } | 318 } |
319 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 319 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
320 | 320 |
321 current_version |= GOOGLE_URL_TRACKER_PREFS; | 321 current_version |= GOOGLE_URL_TRACKER_PREFS; |
322 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 322 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
323 current_version); | 323 current_version); |
324 } | 324 } |
325 } | 325 } |
326 | 326 |
327 } // namespace browser | 327 } // namespace browser |
OLD | NEW |