Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 8383004: Adding CookieSettings for storing cookie content settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing the rebase. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 TabContentsWrapper::RegisterUserPrefs(user_prefs); 156 TabContentsWrapper::RegisterUserPrefs(user_prefs);
156 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 157 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
157 ExtensionWebUI::RegisterUserPrefs(user_prefs); 158 ExtensionWebUI::RegisterUserPrefs(user_prefs);
158 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 159 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
159 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 160 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
160 NewTabUI::RegisterUserPrefs(user_prefs); 161 NewTabUI::RegisterUserPrefs(user_prefs);
161 PluginsUI::RegisterUserPrefs(user_prefs); 162 PluginsUI::RegisterUserPrefs(user_prefs);
162 ProfileImpl::RegisterUserPrefs(user_prefs); 163 ProfileImpl::RegisterUserPrefs(user_prefs);
163 PromoResourceService::RegisterUserPrefs(user_prefs); 164 PromoResourceService::RegisterUserPrefs(user_prefs);
164 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 165 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
166 CookieSettings::RegisterUserPrefs(user_prefs);
165 DevToolsWindow::RegisterUserPrefs(user_prefs); 167 DevToolsWindow::RegisterUserPrefs(user_prefs);
166 PinnedTabCodec::RegisterUserPrefs(user_prefs); 168 PinnedTabCodec::RegisterUserPrefs(user_prefs);
167 ExtensionPrefs::RegisterUserPrefs(user_prefs); 169 ExtensionPrefs::RegisterUserPrefs(user_prefs);
168 TranslatePrefs::RegisterUserPrefs(user_prefs); 170 TranslatePrefs::RegisterUserPrefs(user_prefs);
169 PrefProxyConfigService::RegisterPrefs(user_prefs); 171 PrefProxyConfigService::RegisterPrefs(user_prefs);
170 #if defined(TOOLKIT_VIEWS) 172 #if defined(TOOLKIT_VIEWS)
171 BrowserActionsContainer::RegisterUserPrefs(user_prefs); 173 BrowserActionsContainer::RegisterUserPrefs(user_prefs);
172 #elif defined(TOOLKIT_GTK) 174 #elif defined(TOOLKIT_GTK)
173 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 175 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
174 #endif 176 #endif
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 218 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
217 } 219 }
218 local_state->ClearPref(prefs::kBrowserWindowPlacement); 220 local_state->ClearPref(prefs::kBrowserWindowPlacement);
219 221
220 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 222 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
221 current_version | WINDOWS_PREFS); 223 current_version | WINDOWS_PREFS);
222 } 224 }
223 } 225 }
224 226
225 } // namespace browser 227 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/net/cookie_policy_browsertest.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698