chrome/renderer/content_settings_observer.cc - Issue 8334020: Check for default content setting pattern when requiring user authorization for plug-ins.

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/renderer/content_settings_observer.cc

Issue 8334020: Check for default content setting pattern when requiring user authorization for plug-ins. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review Created 9 years, 2 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

Index: chrome/renderer/content_settings_observer.cc

diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc

index a8d0e241d07c7fc8f64fbf02456103f877951732..94150e65b4ff6968ee426bb3a351b9eb13b55024 100644

--- a/chrome/renderer/content_settings_observer.cc

+++ b/chrome/renderer/content_settings_observer.cc

@@ -77,10 +77,8 @@ void ContentSettingsObserver::SetDefaultContentSettings(

ContentSetting ContentSettingsObserver::GetContentSetting(

ContentSettingsType type) {

- if (type == CONTENT_SETTINGS_TYPE_PLUGINS &&

- plugins_temporarily_allowed_) {

- return CONTENT_SETTING_ALLOW;

- }

+ // Don't call this for plug-ins.

+ DCHECK_NE(CONTENT_SETTINGS_TYPE_PLUGINS, type);

return current_content_settings_.settings[type];

}

« no previous file with comments | « chrome/renderer/content_settings_observer.h ('k') | chrome/renderer/content_settings_observer_browsertest.cc » ('j') | no next file with comments »