| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 9eb76ace69d95a39a4aafe5d0acbc686646179a5..69f257565102657cf9630d4f89be8d1431db6ac8 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -130,7 +130,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/message_box_type.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/point.h"
|
| #include "ui/gfx/rect.h"
|
| @@ -1572,29 +1572,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_TYPE_JAVASCRIPT_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::MESSAGE_BOX_TYPE_JAVASCRIPT_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::MESSAGE_BOX_TYPE_JAVASCRIPT_PROMPT,
|
| message,
|
| default_value,
|
| frame->document().url(),
|
|
|