views: Add an Options enum to MessageBoxView control.

chrome/browser/ui/views/js_modal_dialog_views.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 "chrome/browser/ui/views/js_modal_dialog_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/views/window.h"
 #include "grit/generated_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/message_box_flags.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // JSModalDialogViews, public:
 
-JSModalDialogViews::JSModalDialogViews(
-    JavaScriptAppModalDialog* parent)
-    : parent_(parent),
-      message_box_view_(new views::MessageBoxView(
-          parent->dialog_flags() | ui::MessageBoxFlags::kAutoDetectAlignment,
-          parent->message_text(),
-          parent->default_prompt_text())) {
+JSModalDialogViews::JSModalDialogViews(JavaScriptAppModalDialog* parent)
+    : parent_(parent) {
+  int options = views::MessageBoxView::DETECT_ALIGNMENT;
+  if (parent->javascript_message_type() == ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT)
+    options |= views::MessageBoxView::HAS_PROMPT_FIELD;
+
+  message_box_view_ = new views::MessageBoxView(options,
+                                                parent->message_text(),
+                                                parent->default_prompt_text());
   DCHECK(message_box_view_);
 
   message_box_view_->AddAccelerator(
       ui::Accelerator(ui::VKEY_C, false, true, false));
   if (parent->display_suppress_checkbox()) {
     message_box_view_->SetCheckBoxLabel(
         l10n_util::GetStringUTF16(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION));
   }
 }
 
@@ skipping 25 matching lines @@
 }
 
 void JSModalDialogViews::CancelAppModalDialog() {
   GetDialogClientView()->CancelWindow();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // JSModalDialogViews, views::DialogDelegate implementation:
 
 int JSModalDialogViews::GetDefaultDialogButton() const {
-  if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasOKButton)
+  if (parent_->javascript_message_type() == ui::JAVASCRIPT_MESSAGE_TYPE_ALERT)
     return ui::DIALOG_BUTTON_OK;
 
-  if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasCancelButton)
-    return ui::DIALOG_BUTTON_CANCEL;
-
-  return ui::DIALOG_BUTTON_NONE;
+  return ui::DIALOG_BUTTON_CANCEL;
 }
 
 int JSModalDialogViews::GetDialogButtons() const {
-  int dialog_buttons = ui::DIALOG_BUTTON_NONE;
-  if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasOKButton)
-    dialog_buttons = ui::DIALOG_BUTTON_OK;
+  if (parent_->javascript_message_type() == ui::JAVASCRIPT_MESSAGE_TYPE_ALERT)
+    return ui::DIALOG_BUTTON_OK;
 
-  if (parent_->dialog_flags() & ui::MessageBoxFlags::kFlagHasCancelButton)
-    dialog_buttons |= ui::DIALOG_BUTTON_CANCEL;
-
-  return dialog_buttons;
+  return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 }
 
 string16 JSModalDialogViews::GetWindowTitle() const {
   return parent_->title();
 }
 
-
 void JSModalDialogViews::WindowClosing() {
 }
 
 void JSModalDialogViews::DeleteDelegate() {
   delete parent_;
   delete this;
 }
 
 bool JSModalDialogViews::Cancel() {
   parent_->OnCancel(message_box_view_->IsCheckBoxSelected());
@@ skipping 54 matching lines @@
 
 // static
 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
     JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent_window) {
   JSModalDialogViews* d = new JSModalDialogViews(dialog);
 
   browser::CreateViewsWindow(parent_window, d, STYLE_GENERIC);
   return d;
 }