chrome/browser/content_settings/content_settings_policy_provider.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

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/content_settings/content_settings_policy_provider.cc

Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/content_settings_details.h ('K') | « chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider_unittest.cc » ('j') | chrome/common/chrome_content_settings_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_policy_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc

index f41669e5cc00644e4b4b0e23dbfbc9255948c12f..01c79380dce02d949e47c2d6011c2c2dbb01bd01 100644

--- a/chrome/browser/content_settings/content_settings_policy_provider.cc

+++ b/chrome/browser/content_settings/content_settings_policy_provider.cc

@@ -13,6 +13,7 @@

#include "chrome/browser/chrome_notification_types.h"

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

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

+#include "chrome/common/chrome_content_settings_client.h"

#include "chrome/common/content_settings_pattern.h"

#include "chrome/common/pref_names.h"

#include "components/pref_registry/pref_registry_syncable.h"

@@ -365,12 +366,13 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(

continue;

}

+ content_settings::ChromeContentSettingsClient client;

ContentSettingsPattern pattern =

- ContentSettingsPattern::FromString(pattern_str);

+ ContentSettingsPattern::FromString(&client, pattern_str);

// Ignore invalid patterns.

if (!pattern.IsValid()) {

VLOG(1) << "Ignoring invalid certificate auto select setting:"

- " Invalid content settings pattern: " << pattern;

+ << " Invalid content settings pattern: " << pattern.ToString(&client);

continue;

}