views: Add an Options enum to MessageBoxView control.

content/renderer/render_view_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 112 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #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"
 #include "v8/include/v8.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
@@ skipping 1120 matching lines @@
         failed_request, error, &alt_html, NULL);
     error_html = &alt_html;
   }
 
   frame->loadHTMLString(*error_html,
                         GURL(chrome::kUnreachableWebDataURL),
                         error.unreachableURL,
                         replace);
 }
 
-bool RenderViewImpl::RunJavaScriptMessage(int type,
+bool RenderViewImpl::RunJavaScriptMessage(ui::JavascriptMessageType type,
                                           const string16& message,
                                           const string16& default_value,
                                           const GURL& frame_url,
                                           string16* result) {
   bool success = false;
   string16 result_temp;
   if (!result)
     result = &result_temp;
 
   SendAndRunNestedMessageLoop(new ViewHostMsg_RunJavaScriptMessage(
@@ skipping 280 matching lines @@
   ipc_params.title = params.title;
   ipc_params.default_file_name =
       webkit_glue::WebStringToFilePath(params.initialValue);
   ipc_params.accept_types.reserve(params.acceptMIMETypes.size());
   for (size_t i = 0; i < params.acceptMIMETypes.size(); ++i)
     ipc_params.accept_types.push_back(params.acceptMIMETypes[i]);
 
   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(),
                                  &result);
   if (ok)
     actual_value->assign(result);
   return ok;
 }
 
 bool RenderViewImpl::runModalBeforeUnloadDialog(
@@ skipping 3144 matching lines @@
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit(
     const IPC::ChannelHandle& channel_handle) {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
 #endif
 }