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" |
11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
12 #include "chrome/browser/browser_shutdown.h" | 12 #include "chrome/browser/browser_shutdown.h" |
| 13 #include "chrome/browser/content_settings/cookie_settings.h" |
13 #include "chrome/browser/content_settings/host_content_settings_map.h" | 14 #include "chrome/browser/content_settings/host_content_settings_map.h" |
14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
15 #include "chrome/browser/debugger/devtools_window.h" | 16 #include "chrome/browser/debugger/devtools_window.h" |
16 #include "chrome/browser/download/download_prefs.h" | 17 #include "chrome/browser/download/download_prefs.h" |
17 #include "chrome/browser/extensions/apps_promo.h" | 18 #include "chrome/browser/extensions/apps_promo.h" |
18 #include "chrome/browser/extensions/extension_prefs.h" | 19 #include "chrome/browser/extensions/extension_prefs.h" |
19 #include "chrome/browser/extensions/extension_web_ui.h" | 20 #include "chrome/browser/extensions/extension_web_ui.h" |
20 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 21 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
21 #include "chrome/browser/geolocation/geolocation_prefs.h" | 22 #include "chrome/browser/geolocation/geolocation_prefs.h" |
22 #include "chrome/browser/google/google_url_tracker.h" | 23 #include "chrome/browser/google/google_url_tracker.h" |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 TabContentsWrapper::RegisterUserPrefs(user_prefs); | 154 TabContentsWrapper::RegisterUserPrefs(user_prefs); |
154 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 155 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
155 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 156 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
156 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 157 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
157 IncognitoModePrefs::RegisterUserPrefs(user_prefs); | 158 IncognitoModePrefs::RegisterUserPrefs(user_prefs); |
158 NewTabUI::RegisterUserPrefs(user_prefs); | 159 NewTabUI::RegisterUserPrefs(user_prefs); |
159 PluginsUI::RegisterUserPrefs(user_prefs); | 160 PluginsUI::RegisterUserPrefs(user_prefs); |
160 ProfileImpl::RegisterUserPrefs(user_prefs); | 161 ProfileImpl::RegisterUserPrefs(user_prefs); |
161 PromoResourceService::RegisterUserPrefs(user_prefs); | 162 PromoResourceService::RegisterUserPrefs(user_prefs); |
162 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 163 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
| 164 CookieSettings::RegisterUserPrefs(user_prefs); |
163 DevToolsWindow::RegisterUserPrefs(user_prefs); | 165 DevToolsWindow::RegisterUserPrefs(user_prefs); |
164 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 166 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
165 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 167 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
166 TranslatePrefs::RegisterUserPrefs(user_prefs); | 168 TranslatePrefs::RegisterUserPrefs(user_prefs); |
167 PrefProxyConfigService::RegisterPrefs(user_prefs); | 169 PrefProxyConfigService::RegisterPrefs(user_prefs); |
168 #if defined(TOOLKIT_VIEWS) | 170 #if defined(TOOLKIT_VIEWS) |
169 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 171 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
170 #elif defined(TOOLKIT_GTK) | 172 #elif defined(TOOLKIT_GTK) |
171 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 173 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
172 #endif | 174 #endif |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 213 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
212 } | 214 } |
213 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 215 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
214 | 216 |
215 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 217 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
216 current_version | WINDOWS_PREFS); | 218 current_version | WINDOWS_PREFS); |
217 } | 219 } |
218 } | 220 } |
219 | 221 |
220 } // namespace browser | 222 } // namespace browser |
OLD | NEW |