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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 7713034: HostContentSettingsMap refactoring. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Code review comments. Created 9 years, 3 months 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/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
16 #include "base/string_util.h" 16 #include "base/string_util.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/content_settings/cookie_settings_factory.h"
24 #include "chrome/browser/content_settings/host_content_settings_map.h" 25 #include "chrome/browser/content_settings/host_content_settings_map.h"
25 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 26 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
26 #include "chrome/browser/defaults.h" 27 #include "chrome/browser/defaults.h"
27 #include "chrome/browser/download/chrome_download_manager_delegate.h" 28 #include "chrome/browser/download/chrome_download_manager_delegate.h"
28 #include "chrome/browser/extensions/extension_devtools_manager.h" 29 #include "chrome/browser/extensions/extension_devtools_manager.h"
29 #include "chrome/browser/extensions/extension_error_reporter.h" 30 #include "chrome/browser/extensions/extension_error_reporter.h"
30 #include "chrome/browser/extensions/extension_event_router.h" 31 #include "chrome/browser/extensions/extension_event_router.h"
31 #include "chrome/browser/extensions/extension_info_map.h" 32 #include "chrome/browser/extensions/extension_info_map.h"
32 #include "chrome/browser/extensions/extension_message_service.h" 33 #include "chrome/browser/extensions/extension_message_service.h"
33 #include "chrome/browser/extensions/extension_pref_store.h" 34 #include "chrome/browser/extensions/extension_pref_store.h"
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 } 837 }
837 838
838 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() { 839 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() {
839 return extension_event_router_.get(); 840 return extension_event_router_.get();
840 } 841 }
841 842
842 ExtensionSpecialStoragePolicy* 843 ExtensionSpecialStoragePolicy*
843 ProfileImpl::GetExtensionSpecialStoragePolicy() { 844 ProfileImpl::GetExtensionSpecialStoragePolicy() {
844 if (!extension_special_storage_policy_.get()) { 845 if (!extension_special_storage_policy_.get()) {
845 extension_special_storage_policy_ = 846 extension_special_storage_policy_ =
846 new ExtensionSpecialStoragePolicy(GetHostContentSettingsMap()); 847 new ExtensionSpecialStoragePolicy(
848 CookieSettingsFactory::GetForProfile(this));
847 } 849 }
848 return extension_special_storage_policy_.get(); 850 return extension_special_storage_policy_.get();
849 } 851 }
850 852
851 SSLHostState* ProfileImpl::GetSSLHostState() { 853 SSLHostState* ProfileImpl::GetSSLHostState() {
852 if (!ssl_host_state_.get()) 854 if (!ssl_host_state_.get())
853 ssl_host_state_.reset(new SSLHostState()); 855 ssl_host_state_.reset(new SSLHostState());
854 856
855 DCHECK(ssl_host_state_->CalledOnValidThread()); 857 DCHECK(ssl_host_state_->CalledOnValidThread());
856 return ssl_host_state_.get(); 858 return ssl_host_state_.get();
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 #endif 1728 #endif
1727 } 1729 }
1728 return prerender_manager_.get(); 1730 return prerender_manager_.get();
1729 } 1731 }
1730 1732
1731 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() { 1733 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
1732 if (!spellcheck_profile_.get()) 1734 if (!spellcheck_profile_.get())
1733 spellcheck_profile_.reset(new SpellCheckProfile()); 1735 spellcheck_profile_.reset(new SpellCheckProfile());
1734 return spellcheck_profile_.get(); 1736 return spellcheck_profile_.get();
1735 } 1737 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698