chrome/browser/ui/content_settings/content_setting_image_model.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

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

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed patch conflict 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:

Index: chrome/browser/ui/content_settings/content_setting_image_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc

index 25709468eb164b3d321954704e6a0e73abe965ea..aa695c98d31afb7c26b99fd2089bd45f1841bd62 100644

--- a/chrome/browser/ui/content_settings/content_setting_image_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/content_settings/content_setting_image_model.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

#include "chrome/browser/prerender/prerender_manager.h"

#include "chrome/browser/profiles/profile.h"

@@ -197,7 +198,8 @@ void ContentSettingBlockedImageModel::UpdateFromWebContents(

// due to auto-blocking NPAPI plugins).

Profile* profile =

Profile::FromBrowserContext(web_contents->GetBrowserContext());

- HostContentSettingsMap* map = profile->GetHostContentSettingsMap();

+ HostContentSettingsMap* map =

+ HostContentSettingsMapFactory::GetForProfile(profile);

if (type == CONTENT_SETTINGS_TYPE_PLUGINS) {

GURL url = web_contents->GetURL();

if (map->GetContentSetting(url, url, type, std::string()) !=