Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1549)

Unified Diff: content/renderer/render_view_impl.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | ipc/param_traits_macros.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 578eb5ee30171aa8894638deb157e7759b6acda9..13d045a83e583df44874f0a94c46a4b608fa79a1 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -131,7 +131,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/message_box_flags.h"
+#include "ui/base/javascript_message_type.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
@@ -1283,7 +1283,7 @@ void RenderViewImpl::LoadNavigationErrorPage(
replace);
}
-bool RenderViewImpl::RunJavaScriptMessage(int type,
+bool RenderViewImpl::RunJavaScriptMessage(ui::JavascriptMessageType type,
const string16& message,
const string16& default_value,
const GURL& frame_url,
@@ -1584,29 +1584,30 @@ bool RenderViewImpl::runFileChooser(
return ScheduleFileChooser(ipc_params, chooser_completion);
}
-void RenderViewImpl::runModalAlertDialog(
- WebFrame* frame, const WebString& message) {
- RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptAlert,
+void RenderViewImpl::runModalAlertDialog(WebFrame* frame,
+ const WebString& message) {
+ RunJavaScriptMessage(ui::JAVASCRIPT_MESSAGE_TYPE_ALERT,
message,
string16(),
frame->document().url(),
NULL);
}
-bool RenderViewImpl::runModalConfirmDialog(
- WebFrame* frame, const WebString& message) {
- return RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptConfirm,
+bool RenderViewImpl::runModalConfirmDialog(WebFrame* frame,
+ const WebString& message) {
+ return RunJavaScriptMessage(ui::JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
message,
string16(),
frame->document().url(),
NULL);
}
-bool RenderViewImpl::runModalPromptDialog(
- WebFrame* frame, const WebString& message, const WebString& default_value,
- WebString* actual_value) {
+bool RenderViewImpl::runModalPromptDialog(WebFrame* frame,
+ const WebString& message,
+ const WebString& default_value,
+ WebString* actual_value) {
string16 result;
- bool ok = RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptPrompt,
+ bool ok = RunJavaScriptMessage(ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT,
message,
default_value,
frame->document().url(),
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | ipc/param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698