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

Side by Side Diff: ios/chrome/browser/content_settings/cookie_settings_factory.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/content_settings/cookie_settings_factory.h" 5 #include "ios/chrome/browser/content_settings/cookie_settings_factory.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "components/content_settings/core/browser/cookie_settings.h" 8 #include "components/content_settings/core/browser/cookie_settings.h"
9 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 9 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
10 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" 10 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
11 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h" 11 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h"
12 12
13 namespace { 13 namespace {
14 const char kDummyExtensionScheme[] = ":no-extension-scheme:"; 14 const char kDummyExtensionScheme[] = ":no-extension-scheme:";
15 } 15 }
16 16
17 namespace ios { 17 namespace ios {
18 18
19 // static 19 // static
20 scoped_refptr<content_settings::CookieSettings> 20 scoped_refptr<content_settings::CookieSettings>
21 CookieSettingsFactory::GetForBrowserState( 21 CookieSettingsFactory::GetForBrowserState(
22 ios::ChromeBrowserState* browser_state) { 22 ios::ChromeBrowserState* browser_state) {
23 return static_cast<content_settings::CookieSettings*>( 23 return static_cast<content_settings::CookieSettings*>(
24 GetInstance()->GetServiceForBrowserState(browser_state, true).get()); 24 GetInstance()->GetServiceForBrowserState(browser_state, true).get());
25 } 25 }
26 26
27 // static 27 // static
28 CookieSettingsFactory* CookieSettingsFactory::GetInstance() { 28 CookieSettingsFactory* CookieSettingsFactory::GetInstance() {
29 return Singleton<CookieSettingsFactory>::get(); 29 return base::Singleton<CookieSettingsFactory>::get();
30 } 30 }
31 31
32 CookieSettingsFactory::CookieSettingsFactory() 32 CookieSettingsFactory::CookieSettingsFactory()
33 : RefcountedBrowserStateKeyedServiceFactory( 33 : RefcountedBrowserStateKeyedServiceFactory(
34 "CookieSettings", 34 "CookieSettings",
35 BrowserStateDependencyManager::GetInstance()) { 35 BrowserStateDependencyManager::GetInstance()) {
36 } 36 }
37 37
38 CookieSettingsFactory::~CookieSettingsFactory() { 38 CookieSettingsFactory::~CookieSettingsFactory() {
39 } 39 }
(...skipping 14 matching lines...) Expand all
54 CookieSettingsFactory::BuildServiceInstanceFor( 54 CookieSettingsFactory::BuildServiceInstanceFor(
55 web::BrowserState* context) const { 55 web::BrowserState* context) const {
56 ios::ChromeBrowserState* browser_state = 56 ios::ChromeBrowserState* browser_state =
57 ios::ChromeBrowserState::FromBrowserState(context); 57 ios::ChromeBrowserState::FromBrowserState(context);
58 return new content_settings::CookieSettings( 58 return new content_settings::CookieSettings(
59 browser_state->GetHostContentSettingsMap(), browser_state->GetPrefs(), 59 browser_state->GetHostContentSettingsMap(), browser_state->GetPrefs(),
60 kDummyExtensionScheme); 60 kDummyExtensionScheme);
61 } 61 }
62 62
63 } // namespace ios 63 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698