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/browser_prefs.h" | 5 #include "chrome/browser/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/bookmarks/bookmark_utils.h" | 9 #include "chrome/browser/bookmarks/bookmark_utils.h" |
10 #include "chrome/browser/browser.h" | 10 #include "chrome/browser/browser.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 48 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
49 #include "chrome/browser/views/browser_actions_container.h" | 49 #include "chrome/browser/views/browser_actions_container.h" |
50 #include "chrome/browser/views/frame/browser_view.h" | 50 #include "chrome/browser/views/frame/browser_view.h" |
51 #endif | 51 #endif |
52 | 52 |
53 #if defined(TOOLKIT_GTK) | 53 #if defined(TOOLKIT_GTK) |
54 #include "chrome/browser/gtk/browser_window_gtk.h" | 54 #include "chrome/browser/gtk/browser_window_gtk.h" |
55 #endif | 55 #endif |
56 | 56 |
57 #if defined(OS_CHROMEOS) | 57 #if defined(OS_CHROMEOS) |
| 58 #include "chrome/browser/chromeos/login/apply_services_customization.h" |
58 #include "chrome/browser/chromeos/login/user_manager.h" | 59 #include "chrome/browser/chromeos/login/user_manager.h" |
59 #include "chrome/browser/chromeos/login/wizard_controller.h" | 60 #include "chrome/browser/chromeos/login/wizard_controller.h" |
60 #include "chrome/browser/chromeos/preferences.h" | 61 #include "chrome/browser/chromeos/preferences.h" |
61 #include "chrome/browser/chromeos/status/language_menu_button.h" | 62 #include "chrome/browser/chromeos/status/language_menu_button.h" |
62 #endif | 63 #endif |
63 | 64 |
64 namespace browser { | 65 namespace browser { |
65 | 66 |
66 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { | 67 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { |
67 RegisterLocalState(local_state); | 68 RegisterLocalState(local_state); |
(...skipping 18 matching lines...) Expand all Loading... |
86 BrowserView::RegisterBrowserViewPrefs(local_state); | 87 BrowserView::RegisterBrowserViewPrefs(local_state); |
87 #endif | 88 #endif |
88 UpgradeDetector::RegisterPrefs(local_state); | 89 UpgradeDetector::RegisterPrefs(local_state); |
89 TaskManager::RegisterPrefs(local_state); | 90 TaskManager::RegisterPrefs(local_state); |
90 geolocation::RegisterPrefs(local_state); | 91 geolocation::RegisterPrefs(local_state); |
91 AutoFillManager::RegisterBrowserPrefs(local_state); | 92 AutoFillManager::RegisterBrowserPrefs(local_state); |
92 #if defined(OS_CHROMEOS) | 93 #if defined(OS_CHROMEOS) |
93 chromeos::UserManager::RegisterPrefs(local_state); | 94 chromeos::UserManager::RegisterPrefs(local_state); |
94 WizardController::RegisterPrefs(local_state); | 95 WizardController::RegisterPrefs(local_state); |
95 chromeos::LanguageMenuButton::RegisterPrefs(local_state); | 96 chromeos::LanguageMenuButton::RegisterPrefs(local_state); |
| 97 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); |
96 #endif | 98 #endif |
97 } | 99 } |
98 | 100 |
99 void RegisterUserPrefs(PrefService* user_prefs) { | 101 void RegisterUserPrefs(PrefService* user_prefs) { |
100 // User prefs | 102 // User prefs |
101 AutoFillManager::RegisterUserPrefs(user_prefs); | 103 AutoFillManager::RegisterUserPrefs(user_prefs); |
102 SessionStartupPref::RegisterUserPrefs(user_prefs); | 104 SessionStartupPref::RegisterUserPrefs(user_prefs); |
103 Browser::RegisterUserPrefs(user_prefs); | 105 Browser::RegisterUserPrefs(user_prefs); |
104 PasswordManager::RegisterUserPrefs(user_prefs); | 106 PasswordManager::RegisterUserPrefs(user_prefs); |
105 chrome_browser_net::RegisterUserPrefs(user_prefs); | 107 chrome_browser_net::RegisterUserPrefs(user_prefs); |
(...skipping 21 matching lines...) Expand all Loading... |
127 certificate_manager_util::RegisterUserPrefs(user_prefs); | 129 certificate_manager_util::RegisterUserPrefs(user_prefs); |
128 #endif | 130 #endif |
129 #if defined(OS_CHROMEOS) | 131 #if defined(OS_CHROMEOS) |
130 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 132 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
131 #endif | 133 #endif |
132 BackgroundContentsService::RegisterUserPrefs(user_prefs); | 134 BackgroundContentsService::RegisterUserPrefs(user_prefs); |
133 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); | 135 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); |
134 } | 136 } |
135 | 137 |
136 } // namespace browser | 138 } // namespace browser |
OLD | NEW |