content/browser/renderer_host/render_view_host.cc - Issue 8553001: views: Add an Options enum to MessageBoxView control.

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: content/browser/renderer_host/render_view_host.cc

Issue 8553001: views: Add an Options enum to MessageBoxView control. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: adding an IPC_MESSAGE_EXPORT to line 30 of param_traits_macro.h makes it link in shared build Created 9 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:

Index: content/browser/renderer_host/render_view_host.cc

diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc

index d177462310c82c5c1ded54213bf55178cc9323fe..f663f6ef2e3cf1def738c7b972df7413587661d2 100644

--- a/content/browser/renderer_host/render_view_host.cc

+++ b/content/browser/renderer_host/render_view_host.cc

@@ -1061,14 +1061,14 @@ void RenderViewHost::OnMsgRunJavaScriptMessage(

const string16& message,

const string16& default_prompt,

const GURL& frame_url,

- const int flags,

+ ui::JavascriptMessageType type,

IPC::Message* reply_msg) {

// While a JS message dialog is showing, tabs in the same process shouldn't

// process input events.

process()->SetIgnoreInputEvents(true);

StopHangMonitorTimeout();

delegate_->RunJavaScriptMessage(this, message, default_prompt, frame_url,

- flags, reply_msg,

+ type, reply_msg,

&are_javascript_messages_suppressed_);

}