ios/chrome/browser/content_settings/host_content_settings_map_factory.cc - Issue 1662843002: Revert of Delete base/prefs and update callers to use components.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.cc ('k') | ios/chrome/browser/data_reduction_proxy/ios_chrome_data_reduction_proxy_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/host_content_settings_map_factory. h"	5 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory. h"

6	6

7 #include "base/memory/singleton.h"	7 #include "base/memory/singleton.h"

	8 #include "base/prefs/pref_service.h"

8 #include "components/content_settings/core/browser/host_content_settings_map.h"	9 #include "components/content_settings/core/browser/host_content_settings_map.h"

9 #include "components/keyed_service/ios/browser_state_dependency_manager.h"	10 #include "components/keyed_service/ios/browser_state_dependency_manager.h"

10 #include "components/prefs/pref_service.h"

11 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"	11 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"

12 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h"	12 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h"

13	13

14 namespace ios {	14 namespace ios {

15	15

16 // static	16 // static

17 HostContentSettingsMap* HostContentSettingsMapFactory::GetForBrowserState(	17 HostContentSettingsMap* HostContentSettingsMapFactory::GetForBrowserState(

18 ios::ChromeBrowserState* browser_state) {	18 ios::ChromeBrowserState* browser_state) {

19 return static_cast<HostContentSettingsMap*>(	19 return static_cast<HostContentSettingsMap*>(

20 GetInstance()->GetServiceForBrowserState(browser_state, true).get());	20 GetInstance()->GetServiceForBrowserState(browser_state, true).get());

(...skipping 25 matching lines...) Expand all Loading...
46 browser_state->GetPrefs(), browser_state->IsOffTheRecord(),	46 browser_state->GetPrefs(), browser_state->IsOffTheRecord(),

47 false /* guest_profile */));	47 false /* guest_profile */));

48 }	48 }

49	49

50 web::BrowserState* HostContentSettingsMapFactory::GetBrowserStateToUse(	50 web::BrowserState* HostContentSettingsMapFactory::GetBrowserStateToUse(

51 web::BrowserState* context) const {	51 web::BrowserState* context) const {

52 return GetBrowserStateOwnInstanceInIncognito(context);	52 return GetBrowserStateOwnInstanceInIncognito(context);

53 }	53 }

54	54

55 } // namespace ios	55 } // namespace ios

OLD	NEW