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

Unified Diff: content/renderer/render_view_impl.cc

Issue 8536026: Convert MessageBoxFlags class into an enum. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 1c6ac4b0175fd4d2ce38e66412bee91be9e46a67..40c25489827a89893768b8ba23b961bd299a6a9b 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1589,29 +1589,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::MESSAGE_BOX_IS_JAVASCRIPT_ALERT_DIALOG,
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::MESSAGE_BOX_IS_JAVASCRIPT_CONFIRM_DIALOG,
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::MESSAGE_BOX_IS_JAVASCRIPT_PROMPT_DIALOG,
message,
default_value,
frame->document().url(),
@@ -1621,8 +1622,8 @@ bool RenderViewImpl::runModalPromptDialog(
return ok;
}
-bool RenderViewImpl::runModalBeforeUnloadDialog(
- WebFrame* frame, const WebString& message) {
+bool RenderViewImpl::runModalBeforeUnloadDialog(WebFrame* frame,
+ const WebString& message) {
// If we are swapping out, we have already run the beforeunload handler.
// TODO(creis): Fix OnSwapOut to clear the frame without running beforeunload
// at all, to avoid running it twice.

Powered by Google App Engine
This is Rietveld 408576698