Move message flags into a separate header that can be used

chrome/renderer/render_view.cc

 // Copyright (c) 2006-2008 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/gfx/png_encoder.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
+#include "chrome/common/message_box_flags.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/debug_message_handler.h"
 #include "chrome/renderer/devtools_agent.h"
 #include "chrome/renderer/devtools_client.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
@@ skipping 37 matching lines @@
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * logging
 //   * printing
 //   * theming
 //   * views
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/renderer/renderer_logging.h"
-#include "chrome/views/controls/message_box_view.h"
 #include "skia/ext/vector_canvas.h"
 #endif
 
 #if defined(OS_WIN)
 // If true, the URL of the active renderer is logged. Logging is done in such
 // way that if the renderer crashes the URL of the active renderer is contained
 // in the dump. Currently mini-dumps are only supported on windows, so this is
 // only enabled on windows.
 #define LOG_RENDERER_URL
 #endif
@@ skipping 1497 matching lines @@
       type == WebNavigationTypeOther;
   if (is_fork) {
     // Open the URL via the browser, not via WebKit.
     OpenURL(webview, url, GURL(), disposition);
     return IGNORE_ACTION;
   }
 
   return disposition;
 }
 
-#if defined(OS_POSIX)
-// TODO(port): remove this massive hack
-// WARNING: massive hack. We can't include message_box_view.h because that
-// tries to pull in the rest of views. So we just define a fake MessageBoxView
-// here with the constants that we require.
-
-class MessageBoxView {
- public:
-  static const int kFlagHasOKButton = 0x1;
-  static const int kFlagHasCancelButton = 0x2;
-  static const int kFlagHasPromptField = 0x4;
-  static const int kFlagHasMessage = 0x8;
-
-  static const int kIsConfirmMessageBox = kFlagHasMessage |
-                                          kFlagHasOKButton |
-                                          kFlagHasCancelButton;
-  static const int kIsJavascriptAlert = kFlagHasOKButton | kFlagHasMessage;
-  static const int kIsJavascriptConfirm = kIsJavascriptAlert |
-                                          kFlagHasCancelButton;
-  static const int kIsJavascriptPrompt = kIsJavascriptConfirm |
-                                         kFlagHasPromptField;
-};
-#endif
-
 void RenderView::RunJavaScriptAlert(WebFrame* webframe,
                                     const std::wstring& message) {
-  RunJavaScriptMessage(MessageBoxView::kIsJavascriptAlert,
+  RunJavaScriptMessage(MessageBox::kIsJavascriptAlert,
                        message,
                        std::wstring(),
                        webframe->GetURL(),
                        NULL);
 }
 
 bool RenderView::RunJavaScriptConfirm(WebFrame* webframe,
                                       const std::wstring& message) {
-  return RunJavaScriptMessage(MessageBoxView::kIsJavascriptConfirm,
+  return RunJavaScriptMessage(MessageBox::kIsJavascriptConfirm,
                               message,
                               std::wstring(),
                               webframe->GetURL(),
                               NULL);
 }
 
 bool RenderView::RunJavaScriptPrompt(WebFrame* webframe,
                                      const std::wstring& message,
                                      const std::wstring& default_value,
                                      std::wstring* result) {
-  return RunJavaScriptMessage(MessageBoxView::kIsJavascriptPrompt,
+  return RunJavaScriptMessage(MessageBox::kIsJavascriptPrompt,
                               message,
                               default_value,
                               webframe->GetURL(),
                               result);
 }
 
 bool RenderView::RunJavaScriptMessage(int type,
                                       const std::wstring& message,
                                       const std::wstring& default_value,
                                       const GURL& frame_url,
@@ skipping 1336 matching lines @@
 void RenderView::OnExtensionResponse(int callback_id,
                                      const std::string& response) {
   WebFrame* web_frame = pending_extension_callbacks_.Lookup(callback_id);
   if (!web_frame)
     return;  // The frame went away.
 
   extensions_v8::ExtensionProcessBindings::ExecuteCallbackInFrame(
       web_frame, callback_id, response);
   pending_extension_callbacks_.Remove(callback_id);
 }