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

Side by Side Diff: chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 17 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
18 #include "chrome/browser/autofill/personal_data_manager.h" 18 #include "chrome/browser/autofill/personal_data_manager.h"
19 #include "chrome/browser/background/background_contents_service_factory.h" 19 #include "chrome/browser/background/background_contents_service_factory.h"
20 #include "chrome/browser/background/background_mode_manager.h" 20 #include "chrome/browser/background/background_mode_manager.h"
21 #include "chrome/browser/bookmarks/bookmark_model.h" 21 #include "chrome/browser/bookmarks/bookmark_model.h"
22 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
23 #include "chrome/browser/browsing_data_remover.h" 23 #include "chrome/browser/browsing_data_remover.h"
24 #include "chrome/browser/chrome_plugin_service_filter.h" 24 #include "chrome/browser/chrome_plugin_service_filter.h"
25 #include "chrome/browser/content_settings/cookie_settings.h"
25 #include "chrome/browser/content_settings/host_content_settings_map.h" 26 #include "chrome/browser/content_settings/host_content_settings_map.h"
26 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 27 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
27 #include "chrome/browser/defaults.h" 28 #include "chrome/browser/defaults.h"
28 #include "chrome/browser/download/download_service.h" 29 #include "chrome/browser/download/download_service.h"
29 #include "chrome/browser/download/download_service_factory.h" 30 #include "chrome/browser/download/download_service_factory.h"
30 #include "chrome/browser/extensions/extension_devtools_manager.h" 31 #include "chrome/browser/extensions/extension_devtools_manager.h"
31 #include "chrome/browser/extensions/extension_error_reporter.h" 32 #include "chrome/browser/extensions/extension_error_reporter.h"
32 #include "chrome/browser/extensions/extension_event_router.h" 33 #include "chrome/browser/extensions/extension_event_router.h"
33 #include "chrome/browser/extensions/extension_info_map.h" 34 #include "chrome/browser/extensions/extension_info_map.h"
34 #include "chrome/browser/extensions/extension_message_service.h" 35 #include "chrome/browser/extensions/extension_message_service.h"
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 } 817 }
817 818
818 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() { 819 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() {
819 return extension_event_router_.get(); 820 return extension_event_router_.get();
820 } 821 }
821 822
822 ExtensionSpecialStoragePolicy* 823 ExtensionSpecialStoragePolicy*
823 ProfileImpl::GetExtensionSpecialStoragePolicy() { 824 ProfileImpl::GetExtensionSpecialStoragePolicy() {
824 if (!extension_special_storage_policy_.get()) { 825 if (!extension_special_storage_policy_.get()) {
825 extension_special_storage_policy_ = 826 extension_special_storage_policy_ =
826 new ExtensionSpecialStoragePolicy(GetHostContentSettingsMap()); 827 new ExtensionSpecialStoragePolicy(CookieSettings::GetForProfile(this));
827 } 828 }
828 return extension_special_storage_policy_.get(); 829 return extension_special_storage_policy_.get();
829 } 830 }
830 831
831 SSLHostState* ProfileImpl::GetSSLHostState() { 832 SSLHostState* ProfileImpl::GetSSLHostState() {
832 if (!ssl_host_state_.get()) 833 if (!ssl_host_state_.get())
833 ssl_host_state_.reset(new SSLHostState()); 834 ssl_host_state_.reset(new SSLHostState());
834 835
835 DCHECK(ssl_host_state_->CalledOnValidThread()); 836 DCHECK(ssl_host_state_->CalledOnValidThread());
836 return ssl_host_state_.get(); 837 return ssl_host_state_.get();
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
1677 1678
1678 void ProfileImpl::ClearNetworkingHistorySince(base::Time time) { 1679 void ProfileImpl::ClearNetworkingHistorySince(base::Time time) {
1679 io_data_.ClearNetworkingHistorySince(time); 1680 io_data_.ClearNetworkingHistorySince(time);
1680 } 1681 }
1681 1682
1682 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() { 1683 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
1683 if (!spellcheck_profile_.get()) 1684 if (!spellcheck_profile_.get())
1684 spellcheck_profile_.reset(new SpellCheckProfile(path_)); 1685 spellcheck_profile_.reset(new SpellCheckProfile(path_));
1685 return spellcheck_profile_.get(); 1686 return spellcheck_profile_.get();
1686 } 1687 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698