OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/background_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "chrome/browser/profiles/profile_manager.h" | 45 #include "chrome/browser/profiles/profile_manager.h" |
46 #include "chrome/browser/renderer_host/web_cache_manager.h" | 46 #include "chrome/browser/renderer_host/web_cache_manager.h" |
47 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 47 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
48 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 48 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
49 #include "chrome/browser/sync/signin_manager.h" | 49 #include "chrome/browser/sync/signin_manager.h" |
50 #include "chrome/browser/tabs/pinned_tab_codec.h" | 50 #include "chrome/browser/tabs/pinned_tab_codec.h" |
51 #include "chrome/browser/task_manager/task_manager.h" | 51 #include "chrome/browser/task_manager/task_manager.h" |
52 #include "chrome/browser/translate/translate_prefs.h" | 52 #include "chrome/browser/translate/translate_prefs.h" |
53 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 53 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
54 #include "chrome/browser/ui/browser.h" | 54 #include "chrome/browser/ui/browser.h" |
| 55 #include "chrome/browser/ui/browser_init.h" |
55 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 56 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
56 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 57 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
57 #include "chrome/browser/ui/webui/flags_ui.h" | 58 #include "chrome/browser/ui/webui/flags_ui.h" |
58 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | 59 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" |
59 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 60 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
60 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" | 61 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" |
61 #include "chrome/browser/ui/webui/plugins_ui.h" | 62 #include "chrome/browser/ui/webui/plugins_ui.h" |
62 #include "chrome/browser/ui/webui/sync_promo_ui.h" | 63 #include "chrome/browser/ui/webui/sync_promo_ui.h" |
63 #include "chrome/browser/upgrade_detector.h" | 64 #include "chrome/browser/upgrade_detector.h" |
64 #include "chrome/browser/web_resource/promo_resource_service.h" | 65 #include "chrome/browser/web_resource/promo_resource_service.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 #endif | 147 #endif |
147 } | 148 } |
148 | 149 |
149 void RegisterUserPrefs(PrefService* user_prefs) { | 150 void RegisterUserPrefs(PrefService* user_prefs) { |
150 // User prefs | 151 // User prefs |
151 AppsPromo::RegisterUserPrefs(user_prefs); | 152 AppsPromo::RegisterUserPrefs(user_prefs); |
152 AutofillManager::RegisterUserPrefs(user_prefs); | 153 AutofillManager::RegisterUserPrefs(user_prefs); |
153 SessionStartupPref::RegisterUserPrefs(user_prefs); | 154 SessionStartupPref::RegisterUserPrefs(user_prefs); |
154 BookmarkModel::RegisterUserPrefs(user_prefs); | 155 BookmarkModel::RegisterUserPrefs(user_prefs); |
155 Browser::RegisterUserPrefs(user_prefs); | 156 Browser::RegisterUserPrefs(user_prefs); |
| 157 BrowserInit::RegisterUserPrefs(user_prefs); |
156 PasswordManager::RegisterUserPrefs(user_prefs); | 158 PasswordManager::RegisterUserPrefs(user_prefs); |
157 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); | 159 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); |
158 DownloadPrefs::RegisterUserPrefs(user_prefs); | 160 DownloadPrefs::RegisterUserPrefs(user_prefs); |
159 bookmark_utils::RegisterUserPrefs(user_prefs); | 161 bookmark_utils::RegisterUserPrefs(user_prefs); |
160 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); | 162 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); |
161 PrefsTabHelper::RegisterUserPrefs(user_prefs); | 163 PrefsTabHelper::RegisterUserPrefs(user_prefs); |
162 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 164 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
163 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 165 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
164 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 166 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
165 IncognitoModePrefs::RegisterUserPrefs(user_prefs); | 167 IncognitoModePrefs::RegisterUserPrefs(user_prefs); |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 228 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
227 } | 229 } |
228 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 230 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
229 | 231 |
230 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 232 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
231 current_version | WINDOWS_PREFS); | 233 current_version | WINDOWS_PREFS); |
232 } | 234 } |
233 } | 235 } |
234 | 236 |
235 } // namespace browser | 237 } // namespace browser |
OLD | NEW |