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_contents_service.h" | 9 #include "chrome/browser/background/background_contents_service.h" |
10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "chrome/browser/net/ssl_config_service_manager.h" | 31 #include "chrome/browser/net/ssl_config_service_manager.h" |
32 #include "chrome/browser/net/predictor_api.h" | 32 #include "chrome/browser/net/predictor_api.h" |
33 #include "chrome/browser/net/pref_proxy_config_service.h" | 33 #include "chrome/browser/net/pref_proxy_config_service.h" |
34 #include "chrome/browser/net/ssl_config_service_manager.h" | 34 #include "chrome/browser/net/ssl_config_service_manager.h" |
35 #include "chrome/browser/notifications/desktop_notification_service.h" | 35 #include "chrome/browser/notifications/desktop_notification_service.h" |
36 #include "chrome/browser/notifications/notification_ui_manager.h" | 36 #include "chrome/browser/notifications/notification_ui_manager.h" |
37 #include "chrome/browser/page_info_model.h" | 37 #include "chrome/browser/page_info_model.h" |
38 #include "chrome/browser/password_manager/password_manager.h" | 38 #include "chrome/browser/password_manager/password_manager.h" |
39 #include "chrome/browser/plugin_updater.h" | 39 #include "chrome/browser/plugin_updater.h" |
40 #include "chrome/browser/policy/cloud_policy_subsystem.h" | 40 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
| 41 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
41 #include "chrome/browser/prefs/session_startup_pref.h" | 42 #include "chrome/browser/prefs/session_startup_pref.h" |
42 #include "chrome/browser/printing/print_job_manager.h" | 43 #include "chrome/browser/printing/print_job_manager.h" |
43 #include "chrome/browser/profiles/profile_impl.h" | 44 #include "chrome/browser/profiles/profile_impl.h" |
44 #include "chrome/browser/profiles/profile_info_cache.h" | 45 #include "chrome/browser/profiles/profile_info_cache.h" |
45 #include "chrome/browser/profiles/profile_manager.h" | 46 #include "chrome/browser/profiles/profile_manager.h" |
46 #include "chrome/browser/remoting/firewall_traversal_tab_helper.h" | 47 #include "chrome/browser/remoting/firewall_traversal_tab_helper.h" |
47 #include "chrome/browser/renderer_host/web_cache_manager.h" | 48 #include "chrome/browser/renderer_host/web_cache_manager.h" |
48 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 49 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
49 #include "chrome/browser/search_engines/template_url_service.h" | 50 #include "chrome/browser/search_engines/template_url_service.h" |
50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 51 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 BookmarkModel::RegisterUserPrefs(user_prefs); | 145 BookmarkModel::RegisterUserPrefs(user_prefs); |
145 Browser::RegisterUserPrefs(user_prefs); | 146 Browser::RegisterUserPrefs(user_prefs); |
146 PasswordManager::RegisterUserPrefs(user_prefs); | 147 PasswordManager::RegisterUserPrefs(user_prefs); |
147 chrome_browser_net::RegisterUserPrefs(user_prefs); | 148 chrome_browser_net::RegisterUserPrefs(user_prefs); |
148 DownloadPrefs::RegisterUserPrefs(user_prefs); | 149 DownloadPrefs::RegisterUserPrefs(user_prefs); |
149 bookmark_utils::RegisterUserPrefs(user_prefs); | 150 bookmark_utils::RegisterUserPrefs(user_prefs); |
150 TabContentsWrapper::RegisterUserPrefs(user_prefs); | 151 TabContentsWrapper::RegisterUserPrefs(user_prefs); |
151 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 152 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
152 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 153 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
153 ExtensionsUI::RegisterUserPrefs(user_prefs); | 154 ExtensionsUI::RegisterUserPrefs(user_prefs); |
| 155 IncognitoModePrefs::RegisterUserPrefs(user_prefs); |
154 NewTabUI::RegisterUserPrefs(user_prefs); | 156 NewTabUI::RegisterUserPrefs(user_prefs); |
155 PluginsUI::RegisterUserPrefs(user_prefs); | 157 PluginsUI::RegisterUserPrefs(user_prefs); |
156 PluginUpdater::RegisterPrefs(user_prefs); | 158 PluginUpdater::RegisterPrefs(user_prefs); |
157 ProfileImpl::RegisterUserPrefs(user_prefs); | 159 ProfileImpl::RegisterUserPrefs(user_prefs); |
158 PromoResourceService::RegisterUserPrefs(user_prefs); | 160 PromoResourceService::RegisterUserPrefs(user_prefs); |
159 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 161 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
160 DevToolsWindow::RegisterUserPrefs(user_prefs); | 162 DevToolsWindow::RegisterUserPrefs(user_prefs); |
161 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 163 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
162 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 164 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
163 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); | 165 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 209 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
208 } | 210 } |
209 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 211 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
210 | 212 |
211 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 213 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
212 current_version | WINDOWS_PREFS); | 214 current_version | WINDOWS_PREFS); |
213 } | 215 } |
214 } | 216 } |
215 | 217 |
216 } // namespace browser | 218 } // namespace browser |
OLD | NEW |