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/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" |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
825 } | 825 } |
826 | 826 |
827 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() { | 827 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() { |
828 return extension_event_router_.get(); | 828 return extension_event_router_.get(); |
829 } | 829 } |
830 | 830 |
831 ExtensionSpecialStoragePolicy* | 831 ExtensionSpecialStoragePolicy* |
832 ProfileImpl::GetExtensionSpecialStoragePolicy() { | 832 ProfileImpl::GetExtensionSpecialStoragePolicy() { |
833 if (!extension_special_storage_policy_.get()) { | 833 if (!extension_special_storage_policy_.get()) { |
834 extension_special_storage_policy_ = | 834 extension_special_storage_policy_ = |
835 new ExtensionSpecialStoragePolicy(GetHostContentSettingsMap()); | 835 new ExtensionSpecialStoragePolicy( |
| 836 GetHostContentSettingsMap()->GetCookieSettings()); |
836 } | 837 } |
837 return extension_special_storage_policy_.get(); | 838 return extension_special_storage_policy_.get(); |
838 } | 839 } |
839 | 840 |
840 SSLHostState* ProfileImpl::GetSSLHostState() { | 841 SSLHostState* ProfileImpl::GetSSLHostState() { |
841 if (!ssl_host_state_.get()) | 842 if (!ssl_host_state_.get()) |
842 ssl_host_state_.reset(new SSLHostState()); | 843 ssl_host_state_.reset(new SSLHostState()); |
843 | 844 |
844 DCHECK(ssl_host_state_->CalledOnValidThread()); | 845 DCHECK(ssl_host_state_->CalledOnValidThread()); |
845 return ssl_host_state_.get(); | 846 return ssl_host_state_.get(); |
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1721 #endif | 1722 #endif |
1722 } | 1723 } |
1723 return prerender_manager_.get(); | 1724 return prerender_manager_.get(); |
1724 } | 1725 } |
1725 | 1726 |
1726 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() { | 1727 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() { |
1727 if (!spellcheck_profile_.get()) | 1728 if (!spellcheck_profile_.get()) |
1728 spellcheck_profile_.reset(new SpellCheckProfile()); | 1729 spellcheck_profile_.reset(new SpellCheckProfile()); |
1729 return spellcheck_profile_.get(); | 1730 return spellcheck_profile_.get(); |
1730 } | 1731 } |
OLD | NEW |