chrome/renderer/chrome_render_view_observer.cc - Issue 10577028: Move the mixed scripting infobar to a page action icon / content setting.

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

Issue 10577028: Move the mixed scripting infobar to a page action icon / content setting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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

« chrome/browser/ui/webui/options2/content_settings_handler2.cc ('K') | « chrome/renderer/chrome_render_view_observer.h ('k') | chrome/renderer/content_settings_observer.h » ('j') | chrome/renderer/content_settings_observer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/chrome_render_view_observer.cc

===================================================================

--- chrome/renderer/chrome_render_view_observer.cc (revision 142907)

+++ chrome/renderer/chrome_render_view_observer.cc (working copy)

@@ -229,7 +229,6 @@

last_indexed_page_id_(-1),

allow_displaying_insecure_content_(false),

allow_running_insecure_content_(false),

- warned_about_insecure_content_(false),

capture_timer_(false, false) {

const CommandLine& command_line = *CommandLine::ForCurrentProcess();

render_view->GetWebView()->setPermissionClient(this);

@@ -630,10 +629,8 @@

SendInsecureContentSignal(INSECURE_CONTENT_RUN_SWF);

if (!allow_running_insecure_content_ && !allowed_per_settings) {

- if (!warned_about_insecure_content_ && !IsStrictSecurityHost(origin_host)) {

- warned_about_insecure_content_ = true;

- Send(new ChromeViewHostMsg_DidBlockRunningInsecureContent(routing_id()));

- }

+ if (!IsStrictSecurityHost(origin_host))

+ content_settings_->DidNotAllowMixedScript();

return false;

}