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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "chrome/browser/profiles/profile_info_cache.h" | 43 #include "chrome/browser/profiles/profile_info_cache.h" |
44 #include "chrome/browser/profiles/profile_manager.h" | 44 #include "chrome/browser/profiles/profile_manager.h" |
45 #include "chrome/browser/renderer_host/web_cache_manager.h" | 45 #include "chrome/browser/renderer_host/web_cache_manager.h" |
46 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 46 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
47 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 47 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
48 #include "chrome/browser/sync/signin_manager.h" | 48 #include "chrome/browser/sync/signin_manager.h" |
49 #include "chrome/browser/tabs/pinned_tab_codec.h" | 49 #include "chrome/browser/tabs/pinned_tab_codec.h" |
50 #include "chrome/browser/task_manager/task_manager.h" | 50 #include "chrome/browser/task_manager/task_manager.h" |
51 #include "chrome/browser/translate/translate_prefs.h" | 51 #include "chrome/browser/translate/translate_prefs.h" |
52 #include "chrome/browser/ui/browser.h" | 52 #include "chrome/browser/ui/browser.h" |
| 53 #include "chrome/browser/ui/browser_init.h" |
53 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 54 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
54 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 55 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
55 #include "chrome/browser/ui/webui/flags_ui.h" | 56 #include "chrome/browser/ui/webui/flags_ui.h" |
56 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | 57 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" |
57 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 58 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
58 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" | 59 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" |
59 #include "chrome/browser/ui/webui/plugins_ui.h" | 60 #include "chrome/browser/ui/webui/plugins_ui.h" |
60 #include "chrome/browser/ui/webui/sync_promo_ui.h" | 61 #include "chrome/browser/ui/webui/sync_promo_ui.h" |
61 #include "chrome/browser/upgrade_detector.h" | 62 #include "chrome/browser/upgrade_detector.h" |
62 #include "chrome/browser/web_resource/promo_resource_service.h" | 63 #include "chrome/browser/web_resource/promo_resource_service.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 #endif | 145 #endif |
145 } | 146 } |
146 | 147 |
147 void RegisterUserPrefs(PrefService* user_prefs) { | 148 void RegisterUserPrefs(PrefService* user_prefs) { |
148 // User prefs | 149 // User prefs |
149 AppsPromo::RegisterUserPrefs(user_prefs); | 150 AppsPromo::RegisterUserPrefs(user_prefs); |
150 AutofillManager::RegisterUserPrefs(user_prefs); | 151 AutofillManager::RegisterUserPrefs(user_prefs); |
151 SessionStartupPref::RegisterUserPrefs(user_prefs); | 152 SessionStartupPref::RegisterUserPrefs(user_prefs); |
152 BookmarkModel::RegisterUserPrefs(user_prefs); | 153 BookmarkModel::RegisterUserPrefs(user_prefs); |
153 Browser::RegisterUserPrefs(user_prefs); | 154 Browser::RegisterUserPrefs(user_prefs); |
| 155 BrowserInit::RegisterUserPrefs(user_prefs); |
154 PasswordManager::RegisterUserPrefs(user_prefs); | 156 PasswordManager::RegisterUserPrefs(user_prefs); |
155 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); | 157 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); |
156 DownloadPrefs::RegisterUserPrefs(user_prefs); | 158 DownloadPrefs::RegisterUserPrefs(user_prefs); |
157 bookmark_utils::RegisterUserPrefs(user_prefs); | 159 bookmark_utils::RegisterUserPrefs(user_prefs); |
158 TabContentsWrapper::RegisterUserPrefs(user_prefs); | 160 TabContentsWrapper::RegisterUserPrefs(user_prefs); |
159 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 161 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
160 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 162 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
161 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 163 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
162 IncognitoModePrefs::RegisterUserPrefs(user_prefs); | 164 IncognitoModePrefs::RegisterUserPrefs(user_prefs); |
163 NewTabUI::RegisterUserPrefs(user_prefs); | 165 NewTabUI::RegisterUserPrefs(user_prefs); |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 224 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
223 } | 225 } |
224 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 226 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
225 | 227 |
226 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 228 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
227 current_version | WINDOWS_PREFS); | 229 current_version | WINDOWS_PREFS); |
228 } | 230 } |
229 } | 231 } |
230 | 232 |
231 } // namespace browser | 233 } // namespace browser |
OLD | NEW |