chrome/browser/infobars/insecure_content_infobar_delegate.cc - Issue 104833006: Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

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/infobars/insecure_content_infobar_delegate.cc

Issue 104833006: Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync Created 7 years 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/guestview/webview/plugin_permission_helper.cc ('k') | chrome/browser/plugins/chrome_plugin_service_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/infobars/insecure_content_infobar_delegate.cc

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

--- chrome/browser/infobars/insecure_content_infobar_delegate.cc (revision 241294)

+++ chrome/browser/infobars/insecure_content_infobar_delegate.cc (working copy)

@@ -9,6 +9,7 @@

#include "chrome/browser/infobars/infobar.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/common/render_messages.h"

+#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/common/page_transition_types.h"

@@ -90,12 +91,13 @@

(type_ == DISPLAY) ? DISPLAY_USER_OVERRIDE : RUN_USER_OVERRIDE,

NUM_EVENTS);

- int32 routing_id = web_contents()->GetRoutingID();

- web_contents()->Send((type_ == DISPLAY) ?

+ web_contents()->SendToAllFrames((type_ == DISPLAY) ?

static_cast<IPC::Message*>(

- new ChromeViewMsg_SetAllowDisplayingInsecureContent(routing_id,

+ new ChromeViewMsg_SetAllowDisplayingInsecureContent(MSG_ROUTING_NONE,

true)) :

- new ChromeViewMsg_SetAllowRunningInsecureContent(routing_id, true));

+ new ChromeViewMsg_SetAllowRunningInsecureContent(MSG_ROUTING_NONE, true));

+ web_contents()->GetMainFrame()->Send(new ChromeViewMsg_ReloadFrame(

+ web_contents()->GetMainFrame()->GetRoutingID()));

return true;

}