diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-09-14 01:32:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-14 08:33:47 +0000 |
| commit | 40b9aedee28c4236b7444813293ea55617463292 (patch) | |
| tree | 9feab862f59c48622dbf4762dfed8cd633bad70e /ios/chrome/browser/content_settings/cookie_settings_factory.cc | |
| parent | e1940cdc8c086d542002c8ddf5976dd57675f53e (diff) | |
| download | chromium_src-40b9aedee28c4236b7444813293ea55617463292.zip chromium_src-40b9aedee28c4236b7444813293ea55617463292.tar.gz chromium_src-40b9aedee28c4236b7444813293ea55617463292.tar.bz2 | |
Implement HostContentSettingsMapFactory on iOS.
Create a new BrowserStateKeyedServiceFactory that can serve
HostContentSettingsMap tied to an ios::ChromeBrowserState.
Port all ios/ client code to use the new factory instead of
using the ios::ChromeBrowserState accessor and remove that now
obsolete accessor.
BUG=530191,112530
Review URL: https://codereview.chromium.org/1336763004
Cr-Commit-Position: refs/heads/master@{#348584}
Diffstat (limited to 'ios/chrome/browser/content_settings/cookie_settings_factory.cc')
| -rw-r--r-- | ios/chrome/browser/content_settings/cookie_settings_factory.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ios/chrome/browser/content_settings/cookie_settings_factory.cc b/ios/chrome/browser/content_settings/cookie_settings_factory.cc index 89b748e..e271098 100644 --- a/ios/chrome/browser/content_settings/cookie_settings_factory.cc +++ b/ios/chrome/browser/content_settings/cookie_settings_factory.cc @@ -8,6 +8,7 @@ #include "components/content_settings/core/browser/cookie_settings.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" +#include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" namespace { @@ -33,6 +34,7 @@ CookieSettingsFactory::CookieSettingsFactory() : RefcountedBrowserStateKeyedServiceFactory( "CookieSettings", BrowserStateDependencyManager::GetInstance()) { + DependsOn(ios::HostContentSettingsMapFactory::GetInstance()); } CookieSettingsFactory::~CookieSettingsFactory() { @@ -56,8 +58,8 @@ CookieSettingsFactory::BuildServiceInstanceFor( ios::ChromeBrowserState* browser_state = ios::ChromeBrowserState::FromBrowserState(context); return new content_settings::CookieSettings( - browser_state->GetHostContentSettingsMap(), browser_state->GetPrefs(), - kDummyExtensionScheme); + ios::HostContentSettingsMapFactory::GetForBrowserState(browser_state), + browser_state->GetPrefs(), kDummyExtensionScheme); } } // namespace ios |