| 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/autofill/autofill_manager.h" | 7 #include "chrome/browser/autofill/autofill_manager.h" |
| 8 #include "chrome/browser/background_contents_service.h" | 8 #include "chrome/browser/background_contents_service.h" |
| 9 #include "chrome/browser/background_mode_manager.h" | 9 #include "chrome/browser/background_mode_manager.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_utils.h" | 10 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 52 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 53 #include "chrome/browser/views/browser_actions_container.h" | 53 #include "chrome/browser/views/browser_actions_container.h" |
| 54 #include "chrome/browser/views/frame/browser_view.h" | 54 #include "chrome/browser/views/frame/browser_view.h" |
| 55 #endif | 55 #endif |
| 56 | 56 |
| 57 #if defined(TOOLKIT_GTK) | 57 #if defined(TOOLKIT_GTK) |
| 58 #include "chrome/browser/gtk/browser_window_gtk.h" | 58 #include "chrome/browser/gtk/browser_window_gtk.h" |
| 59 #endif | 59 #endif |
| 60 | 60 |
| 61 #if defined(OS_CHROMEOS) | 61 #if defined(OS_CHROMEOS) |
| 62 #include "chrome/browser/chromeos/cros_settings_provider_user.h" |
| 62 #include "chrome/browser/chromeos/login/apply_services_customization.h" | 63 #include "chrome/browser/chromeos/login/apply_services_customization.h" |
| 63 #include "chrome/browser/chromeos/login/user_manager.h" | 64 #include "chrome/browser/chromeos/login/user_manager.h" |
| 64 #include "chrome/browser/chromeos/login/wizard_controller.h" | 65 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 65 #include "chrome/browser/chromeos/preferences.h" | 66 #include "chrome/browser/chromeos/preferences.h" |
| 66 #include "chrome/browser/chromeos/status/language_menu_button.h" | 67 #include "chrome/browser/chromeos/status/language_menu_button.h" |
| 67 #endif | 68 #endif |
| 68 | 69 |
| 69 namespace browser { | 70 namespace browser { |
| 70 | 71 |
| 71 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { | 72 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 89 PageInfoModel::RegisterPrefs(local_state); | 90 PageInfoModel::RegisterPrefs(local_state); |
| 90 #if defined(TOOLKIT_VIEWS) | 91 #if defined(TOOLKIT_VIEWS) |
| 91 BrowserView::RegisterBrowserViewPrefs(local_state); | 92 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 92 #endif | 93 #endif |
| 93 UpgradeDetector::RegisterPrefs(local_state); | 94 UpgradeDetector::RegisterPrefs(local_state); |
| 94 TaskManager::RegisterPrefs(local_state); | 95 TaskManager::RegisterPrefs(local_state); |
| 95 geolocation::RegisterPrefs(local_state); | 96 geolocation::RegisterPrefs(local_state); |
| 96 AutoFillManager::RegisterBrowserPrefs(local_state); | 97 AutoFillManager::RegisterBrowserPrefs(local_state); |
| 97 #if defined(OS_CHROMEOS) | 98 #if defined(OS_CHROMEOS) |
| 98 chromeos::UserManager::RegisterPrefs(local_state); | 99 chromeos::UserManager::RegisterPrefs(local_state); |
| 100 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); |
| 99 WizardController::RegisterPrefs(local_state); | 101 WizardController::RegisterPrefs(local_state); |
| 100 chromeos::LanguageMenuButton::RegisterPrefs(local_state); | 102 chromeos::LanguageMenuButton::RegisterPrefs(local_state); |
| 101 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); | 103 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); |
| 102 #endif | 104 #endif |
| 103 } | 105 } |
| 104 | 106 |
| 105 void RegisterUserPrefs(PrefService* user_prefs) { | 107 void RegisterUserPrefs(PrefService* user_prefs) { |
| 106 // User prefs | 108 // User prefs |
| 107 AutoFillManager::RegisterUserPrefs(user_prefs); | 109 AutoFillManager::RegisterUserPrefs(user_prefs); |
| 108 BackgroundModeManager::RegisterUserPrefs(user_prefs); | 110 BackgroundModeManager::RegisterUserPrefs(user_prefs); |
| (...skipping 28 matching lines...) Expand all Loading... |
| 137 #endif | 139 #endif |
| 138 #if defined(OS_CHROMEOS) | 140 #if defined(OS_CHROMEOS) |
| 139 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 141 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 140 #endif | 142 #endif |
| 141 BackgroundContentsService::RegisterUserPrefs(user_prefs); | 143 BackgroundContentsService::RegisterUserPrefs(user_prefs); |
| 142 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); | 144 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); |
| 143 SigninManager::RegisterUserPrefs(user_prefs); | 145 SigninManager::RegisterUserPrefs(user_prefs); |
| 144 } | 146 } |
| 145 | 147 |
| 146 } // namespace browser | 148 } // namespace browser |
| OLD | NEW |