views: Move MessageBoxView into the namespace views.

BUG=None
TEST=None

R=sky@chromium.org

Review URL: http://codereview.chromium.org/6715020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78994 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 39 insertions, 24 deletions

diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc
index 1c273fb..a44a0b9 100644
--- a/chrome/browser/chromeos/external_protocol_dialog.cc
+++ b/chrome/browser/chromeos/external_protocol_dialog.cc
@@ -96,7 +96,7 @@ ExternalProtocolDialog::ExternalProtocolDialog(TabContents* tab_contents,
       ASCIIToUTF16(url.scheme() + ":"),
       elided_url_without_scheme) + ASCIIToUTF16("\n\n"));
 
-  message_box_view_ = new MessageBoxView(
+  message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kIsConfirmMessageBox,
       message_text,
       std::wstring(),
diff --git a/chrome/browser/chromeos/external_protocol_dialog.h b/chrome/browser/chromeos/external_protocol_dialog.h
index 84f7955..fcb8bea 100644
--- a/chrome/browser/chromeos/external_protocol_dialog.h
+++ b/chrome/browser/chromeos/external_protocol_dialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,9 +10,12 @@
 #include "views/window/dialog_delegate.h"
 
 class GURL;
-class MessageBoxView;
 class TabContents;
 
+namespace views {
+class MessageBoxView;
+}
+
 // An external protocol dialog for ChromeOS. Unlike other platforms,
 // ChromeOS does not support launching external program, therefore,
 // this dialog simply says it is not supported.
@@ -38,7 +41,7 @@ class ExternalProtocolDialog : public views::DialogDelegate {
 
  private:
   // The message box view whose commands we handle.
-  MessageBoxView* message_box_view_;
+  views::MessageBoxView* message_box_view_;
 
   // The time at which this dialog was created.
   base::TimeTicks creation_time_;
diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc
index cc32bcc..b3485c3 100644
--- a/chrome/browser/ui/views/external_protocol_dialog.cc
+++ b/chrome/browser/ui/views/external_protocol_dialog.cc
@@ -141,7 +141,7 @@ ExternalProtocolDialog::ExternalProtocolDialog(TabContents* tab_contents,
   message_text +=
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_WARNING));
 
-  message_box_view_ = new MessageBoxView(
+  message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kIsConfirmMessageBox,
       message_text,
       std::wstring(),
diff --git a/chrome/browser/ui/views/external_protocol_dialog.h b/chrome/browser/ui/views/external_protocol_dialog.h
index da90fe5..445131c 100644
--- a/chrome/browser/ui/views/external_protocol_dialog.h
+++ b/chrome/browser/ui/views/external_protocol_dialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,9 +10,12 @@
 #include "googleurl/src/gurl.h"
 #include "views/window/dialog_delegate.h"
 
-class MessageBoxView;
 class TabContents;
 
+namespace views {
+class MessageBoxView;
+}
+
 class ExternalProtocolDialog : public views::DialogDelegate {
  public:
   // RunExternalProtocolDialog calls this private constructor.
@@ -42,7 +45,7 @@ class ExternalProtocolDialog : public views::DialogDelegate {
 
  private:
   // The message box view whose commands we handle.
-  MessageBoxView* message_box_view_;
+  views::MessageBoxView* message_box_view_;
 
   // The associated TabContents.
   TabContents* tab_contents_;
diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc
index b4fac4c..12d0664 100644
--- a/chrome/browser/ui/views/js_modal_dialog_views.cc
+++ b/chrome/browser/ui/views/js_modal_dialog_views.cc
@@ -12,6 +12,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/message_box_flags.h"
 #include "views/controls/message_box_view.h"
+#include "views/controls/textfield/textfield.h"
 #include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -20,7 +21,7 @@
 JSModalDialogViews::JSModalDialogViews(
     JavaScriptAppModalDialog* parent)
     : parent_(parent),
-      message_box_view_(new MessageBoxView(
+      message_box_view_(new views::MessageBoxView(
           parent->dialog_flags() | ui::MessageBoxFlags::kAutoDetectAlignment,
           parent->message_text(), parent->default_prompt_text())) {
   DCHECK(message_box_view_);
diff --git a/chrome/browser/ui/views/js_modal_dialog_views.h b/chrome/browser/ui/views/js_modal_dialog_views.h
index 8dcdfab..c0bb886 100644
--- a/chrome/browser/ui/views/js_modal_dialog_views.h
+++ b/chrome/browser/ui/views/js_modal_dialog_views.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -14,7 +14,9 @@
 #include "ui/base/message_box_flags.h"
 #include "views/window/dialog_delegate.h"
 
+namespace views {
 class MessageBoxView;
+}
 
 class JSModalDialogViews : public NativeAppModalDialog,
                            public views::DialogDelegate {
@@ -52,7 +54,7 @@ class JSModalDialogViews : public NativeAppModalDialog,
   JavaScriptAppModalDialog* parent_;
 
   // The message box view whose commands we handle.
-  MessageBoxView* message_box_view_;
+  views::MessageBoxView* message_box_view_;
 
   DISALLOW_COPY_AND_ASSIGN(JSModalDialogViews);
 };
diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/repost_form_warning_view.cc
index fc2e3d4..e6c82d3 100644
--- a/chrome/browser/ui/views/repost_form_warning_view.cc
+++ b/chrome/browser/ui/views/repost_form_warning_view.cc
@@ -34,7 +34,7 @@ RepostFormWarningView::RepostFormWarningView(
     TabContents* tab_contents)
       : controller_(new RepostFormWarningController(tab_contents)),
         message_box_view_(NULL) {
-  message_box_view_ = new MessageBoxView(
+  message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kIsConfirmMessageBox,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING)),
       std::wstring());
diff --git a/chrome/browser/ui/views/repost_form_warning_view.h b/chrome/browser/ui/views/repost_form_warning_view.h
index 9756698..c698c93 100644
--- a/chrome/browser/ui/views/repost_form_warning_view.h
+++ b/chrome/browser/ui/views/repost_form_warning_view.h
@@ -11,11 +11,12 @@
 #include "views/window/dialog_delegate.h"
 
 class ConstrainedWindow;
-class MessageBoxView;
 class NavigationController;
 class RepostFormWarningController;
 class TabContents;
+
 namespace views {
+class MessageBoxView;
 class Window;
 }
 
@@ -46,7 +47,7 @@ class RepostFormWarningView : public ConstrainedDialogDelegate {
   virtual ~RepostFormWarningView();
 
   // The message box view whose commands we handle.
-  MessageBoxView* message_box_view_;
+  views::MessageBoxView* message_box_view_;
 
   scoped_ptr<RepostFormWarningController> controller_;
 
diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc
index 420c109..91a736f 100644
--- a/chrome/browser/ui/views/restart_message_box.cc
+++ b/chrome/browser/ui/views/restart_message_box.cc
@@ -53,7 +53,7 @@ views::View* RestartMessageBox::GetContentsView() {
 RestartMessageBox::RestartMessageBox(gfx::NativeWindow parent_window) {
   const int kDialogWidth = 400;
   // Also deleted when the window closes.
-  message_box_view_ = new MessageBoxView(
+  message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kFlagHasMessage |
           ui::MessageBoxFlags::kFlagHasOKButton,
       UTF16ToWide(
diff --git a/chrome/browser/ui/views/restart_message_box.h b/chrome/browser/ui/views/restart_message_box.h
index adb5806..6bb87eb 100644
--- a/chrome/browser/ui/views/restart_message_box.h
+++ b/chrome/browser/ui/views/restart_message_box.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,9 @@
 #include "ui/gfx/native_widget_types.h"
 #include "views/window/dialog_delegate.h"
 
+namespace views {
 class MessageBoxView;
+}
 
 // A dialog box that tells the user that s/he needs to restart Chrome
 // for a change to take effect.
@@ -35,7 +37,7 @@ class RestartMessageBox : public views::DialogDelegate {
   explicit RestartMessageBox(gfx::NativeWindow parent_window);
   virtual ~RestartMessageBox();
 
-  MessageBoxView* message_box_view_;
+  views::MessageBoxView* message_box_view_;
 
   DISALLOW_COPY_AND_ASSIGN(RestartMessageBox);
 };
diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc
index cc672c6..495bd11 100644
--- a/chrome/browser/ui/views/update_recommended_message_box.cc
+++ b/chrome/browser/ui/views/update_recommended_message_box.cc
@@ -89,7 +89,7 @@ UpdateRecommendedMessageBox::UpdateRecommendedMessageBox(
 #endif
   const string16 product_name = l10n_util::GetStringUTF16(kProductNameId);
   // Also deleted when the window closes.
-  message_box_view_ = new MessageBoxView(
+  message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kFlagHasMessage |
           ui::MessageBoxFlags::kFlagHasOKButton,
       UTF16ToWide(l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED,
diff --git a/chrome/browser/ui/views/update_recommended_message_box.h b/chrome/browser/ui/views/update_recommended_message_box.h
index 111a9070..7983f06 100644
--- a/chrome/browser/ui/views/update_recommended_message_box.h
+++ b/chrome/browser/ui/views/update_recommended_message_box.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,9 @@
 #include "ui/gfx/native_widget_types.h"
 #include "views/window/dialog_delegate.h"
 
+namespace views {
 class MessageBoxView;
+}
 
 // A dialog box that tells the user that an update is recommended in order for
 // the latest version to be put to use.
@@ -38,7 +40,7 @@ class UpdateRecommendedMessageBox : public views::DialogDelegate {
   explicit UpdateRecommendedMessageBox(gfx::NativeWindow parent_window);
   virtual ~UpdateRecommendedMessageBox();
 
-  MessageBoxView* message_box_view_;
+  views::MessageBoxView* message_box_view_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateRecommendedMessageBox);
 };
diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc
index 0794d63..20d5055f 100644
--- a/chrome/browser/ui/views/user_data_dir_dialog.cc
+++ b/chrome/browser/ui/views/user_data_dir_dialog.cc
@@ -30,7 +30,7 @@ UserDataDirDialog::UserDataDirDialog(const FilePath& user_data_dir)
       IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY,
       user_data_dir.LossyDisplayName()));
   const int kDialogWidth = 400;
-  message_box_view_ = new MessageBoxView(
+  message_box_view_ = new views::MessageBoxView(
       ui::MessageBoxFlags::kIsConfirmMessageBox,
       message_text.c_str(), std::wstring(), kDialogWidth);
 
diff --git a/chrome/browser/ui/views/user_data_dir_dialog.h b/chrome/browser/ui/views/user_data_dir_dialog.h
index 6c60acd..fd00ac6 100644
--- a/chrome/browser/ui/views/user_data_dir_dialog.h
+++ b/chrome/browser/ui/views/user_data_dir_dialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 //
@@ -15,8 +15,9 @@
 #include "views/window/dialog_delegate.h"
 
 class FilePath;
-class MessageBoxView;
+
 namespace views {
+class MessageBoxView;
 class Window;
 }
 
@@ -59,7 +60,7 @@ class UserDataDirDialog : public views::DialogDelegate,
   // Empty until the user picks a directory.
   FilePath user_data_dir_;
 
-  MessageBoxView* message_box_view_;
+  views::MessageBoxView* message_box_view_;
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   // Used to keep track of whether or not to block the message loop (still