chrome/browser/chrome_content_browser_client.cc - Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum

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/chrome_content_browser_client.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)

Patch Set: rebased Created 3 years, 6 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

« no previous file with comments | « chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc ('k') | chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 6461d76826efa245ffa8394dd215028ea1f5938e..c998d12bcab159fb0470d0f82921f77844d7ed53 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -133,6 +133,7 @@

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

#include "components/content_settings/core/common/content_settings.h"

#include "components/content_settings/core/common/content_settings_types.h"

+#include "components/content_settings/core/common/content_settings_utils.h"

#include "components/dom_distiller/core/dom_distiller_switches.h"

#include "components/dom_distiller/core/url_constants.h"

#include "components/error_page/common/error_page_switches.h"

@@ -755,25 +756,19 @@ float GetDeviceScaleAdjustment() {

void GetGuestViewDefaultContentSettingRules(

bool incognito,

RendererContentSettingRules* rules) {

- rules->image_rules.push_back(

- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTING_ALLOW,

- std::string(),

- incognito));

- rules->script_rules.push_back(

- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTING_ALLOW,

- std::string(),

- incognito));

- rules->autoplay_rules.push_back(

- ContentSettingPatternSource(ContentSettingsPattern::Wildcard(),

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTING_ALLOW,

- std::string(),

- incognito));

+ rules->image_rules.push_back(ContentSettingPatternSource(

+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),

+ content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW),

+ std::string(), incognito));

+ rules->script_rules.push_back(ContentSettingPatternSource(

+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),

+ content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW),

+ std::string(), incognito));

+ rules->autoplay_rules.push_back(ContentSettingPatternSource(

+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),

+ content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW),

+ std::string(), incognito));

}

AppLoadedInTabSource ClassifyAppLoadedInTabSource(