diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 02:43:47 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 02:43:47 +0000 |
| commit | 269f86de339fdf6e9e539c7350a1035ae78fddf7 (patch) | |
| tree | a01853c7b2e36dc4d830fff87fe173a8ee3418b1 /content/browser/renderer_host | |
| parent | 857ecf3fa1b779a9238c881a96001a9adf440b08 (diff) | |
| download | chromium_src-269f86de339fdf6e9e539c7350a1035ae78fddf7.zip chromium_src-269f86de339fdf6e9e539c7350a1035ae78fddf7.tar.gz chromium_src-269f86de339fdf6e9e539c7350a1035ae78fddf7.tar.bz2 | |
views: Add an Options enum to MessageBoxView control.
R=sky@chromium.org
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8553001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
| -rw-r--r-- | content/browser/renderer_host/render_view_host.cc | 4 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host.h | 3 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host_delegate.h | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index d177462..f663f6e 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_); } diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index 99cc989..25f2006 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -25,6 +25,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "ui/base/javascript_message_type.h" #include "webkit/glue/webaccessibility.h" #include "webkit/glue/window_open_disposition.h" @@ -552,7 +553,7 @@ class CONTENT_EXPORT RenderViewHost : public RenderWidgetHost { void OnMsgRunJavaScriptMessage(const string16& message, const string16& default_prompt, const GURL& frame_url, - const int flags, + ui::JavascriptMessageType type, IPC::Message* reply_msg); void OnMsgRunBeforeUnloadConfirm(const GURL& frame_url, const string16& message, diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index d0b4255..f1e4ef0 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h @@ -19,6 +19,7 @@ #include "net/base/load_states.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" +#include "ui/base/javascript_message_type.h" #include "webkit/glue/window_open_disposition.h" class GURL; @@ -290,7 +291,7 @@ class CONTENT_EXPORT RenderViewHostDelegate : public IPC::Channel::Listener { const string16& message, const string16& default_prompt, const GURL& frame_url, - const int flags, + ui::JavascriptMessageType type, IPC::Message* reply_msg, bool* did_suppress_message) {} |