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

18 files changed, 91 insertions, 67 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
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index d1a7864..32892c1 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -11,6 +11,9 @@
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/message_box_flags.h"
 #include "views/controls/button/checkbox.h"
+#include "views/controls/image_view.h"
+#include "views/controls/label.h"
+#include "views/controls/textfield/textfield.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 #include "views/views_delegate.h"
@@ -18,6 +21,8 @@
 
 static const int kDefaultMessageWidth = 320;
 
+namespace views {
+
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, public:
 
@@ -25,7 +30,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
                                const std::wstring& message,
                                const std::wstring& default_prompt,
                                int message_width)
-    : message_label_(new views::Label(message)),
+    : message_label_(new Label(message)),
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
@@ -37,7 +42,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
 MessageBoxView::MessageBoxView(int dialog_flags,
                                const std::wstring& message,
                                const std::wstring& default_prompt)
-    : message_label_(new views::Label(message)),
+    : message_label_(new Label(message)),
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
@@ -60,7 +65,7 @@ bool MessageBoxView::IsCheckBoxSelected() {
 
 void MessageBoxView::SetIcon(const SkBitmap& icon) {
   if (!icon_)
-    icon_ = new views::ImageView();
+    icon_ = new ImageView();
   icon_->SetImage(icon);
   icon_->SetBounds(0, 0, icon.width(), icon.height());
   ResetLayoutManager();
@@ -68,7 +73,7 @@ void MessageBoxView::SetIcon(const SkBitmap& icon) {
 
 void MessageBoxView::SetCheckBoxLabel(const std::wstring& label) {
   if (!checkbox_)
-    checkbox_ = new views::Checkbox(label);
+    checkbox_ = new Checkbox(label);
   else
     checkbox_->SetLabel(label);
   ResetLayoutManager();
@@ -81,11 +86,11 @@ void MessageBoxView::SetCheckBoxSelected(bool selected) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// MessageBoxView, views::View overrides:
+// MessageBoxView, View overrides:
 
 void MessageBoxView::ViewHierarchyChanged(bool is_add,
-                                          views::View* parent,
-                                          views::View* child) {
+                                          View* parent,
+                                          View* child) {
   if (child == this && is_add) {
     if (prompt_field_)
       prompt_field_->SelectAll();
@@ -93,7 +98,7 @@ void MessageBoxView::ViewHierarchyChanged(bool is_add,
 }
 
 bool MessageBoxView::AcceleratorPressed(
-    const views::Accelerator& accelerator) {
+    const Accelerator& accelerator) {
   // We only accepts Ctrl-C.
   DCHECK(accelerator.GetKeyCode() == 'C' && accelerator.IsCtrlDown());
 
@@ -101,11 +106,10 @@ bool MessageBoxView::AcceleratorPressed(
   if (prompt_field_ && prompt_field_->HasFocus())
     return false;
 
-  if (!views::ViewsDelegate::views_delegate)
+  if (!ViewsDelegate::views_delegate)
     return false;
 
-  ui::Clipboard* clipboard =
-      views::ViewsDelegate::views_delegate->GetClipboard();
+  ui::Clipboard* clipboard = ViewsDelegate::views_delegate->GetClipboard();
   if (!clipboard)
     return false;
 
@@ -126,22 +130,22 @@ void MessageBoxView::Init(int dialog_flags,
     // with strong directionality.
     base::i18n::TextDirection direction =
         base::i18n::GetFirstStrongCharacterDirection(message_label_->GetText());
-    views::Label::Alignment alignment;
+    Label::Alignment alignment;
     if (direction == base::i18n::RIGHT_TO_LEFT)
-      alignment = views::Label::ALIGN_RIGHT;
+      alignment = Label::ALIGN_RIGHT;
     else
-      alignment = views::Label::ALIGN_LEFT;
+      alignment = Label::ALIGN_LEFT;
     // In addition, we should set the RTL alignment mode as
     // AUTO_DETECT_ALIGNMENT so that the alignment will not be flipped around
     // in RTL locales.
-    message_label_->set_rtl_alignment_mode(views::Label::AUTO_DETECT_ALIGNMENT);
+    message_label_->set_rtl_alignment_mode(Label::AUTO_DETECT_ALIGNMENT);
     message_label_->SetHorizontalAlignment(alignment);
   } else {
-    message_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+    message_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   }
 
   if (dialog_flags & ui::MessageBoxFlags::kFlagHasPromptField) {
-    prompt_field_ = new views::Textfield;
+    prompt_field_ = new Textfield;
     prompt_field_->SetText(WideToUTF16Hack(default_prompt));
   }
 
@@ -149,9 +153,6 @@ void MessageBoxView::Init(int dialog_flags,
 }
 
 void MessageBoxView::ResetLayoutManager() {
-  using views::GridLayout;
-  using views::ColumnSet;
-
   // Initialize the Grid Layout Manager used for this dialog box.
   GridLayout* layout = GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
@@ -168,7 +169,7 @@ void MessageBoxView::ResetLayoutManager() {
     column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
                           GridLayout::FIXED, icon_size.width(),
                           icon_size.height());
-    column_set->AddPaddingColumn(0, views::kUnrelatedControlHorizontalSpacing);
+    column_set->AddPaddingColumn(0, kUnrelatedControlHorizontalSpacing);
   }
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::FIXED, message_width_, 0);
@@ -179,7 +180,7 @@ void MessageBoxView::ResetLayoutManager() {
     column_set = layout->AddColumnSet(textfield_column_view_set_id);
     if (icon_) {
       column_set->AddPaddingColumn(
-          0, icon_size.width() + views::kUnrelatedControlHorizontalSpacing);
+          0, icon_size.width() + kUnrelatedControlHorizontalSpacing);
     }
     column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                           GridLayout::USE_PREF, 0, 0);
@@ -191,7 +192,7 @@ void MessageBoxView::ResetLayoutManager() {
     column_set = layout->AddColumnSet(checkbox_column_view_set_id);
     if (icon_) {
       column_set->AddPaddingColumn(
-          0, icon_size.width() + views::kUnrelatedControlHorizontalSpacing);
+          0, icon_size.width() + kUnrelatedControlHorizontalSpacing);
     }
     column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                           GridLayout::USE_PREF, 0, 0);
@@ -204,16 +205,18 @@ void MessageBoxView::ResetLayoutManager() {
   layout->AddView(message_label_);
 
   if (prompt_field_) {
-    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, textfield_column_view_set_id);
     layout->AddView(prompt_field_);
   }
 
   if (checkbox_) {
-    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, checkbox_column_view_set_id);
     layout->AddView(checkbox_);
   }
 
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }
+
+}  // namespace views
diff --git a/views/controls/message_box_view.h b/views/controls/message_box_view.h
index 811ad29..9734d17 100644
--- a/views/controls/message_box_view.h
+++ b/views/controls/message_box_view.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.
 
@@ -9,19 +9,19 @@
 #include <string>
 
 #include "base/task.h"
-#include "views/controls/image_view.h"
-#include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 #include "views/view.h"
 
 namespace views {
+
 class Checkbox;
-}
+class ImageView;
+class Label;
+class Textfield;
 
 // This class displays the contents of a message box. It is intended for use
 // within a constrained window, and has options for a message, prompt, OK
 // and Cancel buttons.
-class MessageBoxView : public views::View {
+class MessageBoxView : public View {
  public:
   MessageBoxView(int dialog_flags,
                  const std::wstring& message,
@@ -57,13 +57,13 @@ class MessageBoxView : public views::View {
   void SetCheckBoxSelected(bool selected);
 
  protected:
-  // Layout and Painting functions.
+  // View:
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
-
+                                    views::View* child) OVERRIDE;
   // Handles Ctrl-C and writes the message in the system clipboard.
-  virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
+  virtual bool AcceleratorPressed(
+      const views::Accelerator& accelerator) OVERRIDE;
 
  private:
   // Sets up the layout manager and initializes the prompt field. This should
@@ -75,16 +75,16 @@ class MessageBoxView : public views::View {
   void ResetLayoutManager();
 
   // Message for the message box.
-  views::Label* message_label_;
+  Label* message_label_;
 
   // Input text field for the message box.
-  views::Textfield* prompt_field_;
+  Textfield* prompt_field_;
 
   // Icon displayed in the upper left corner of the message box.
-  views::ImageView* icon_;
+  ImageView* icon_;
 
   // Checkbox for the message box.
-  views::Checkbox* checkbox_;
+  Checkbox* checkbox_;
 
   // Maximum width of the message label.
   int message_width_;
@@ -94,4 +94,6 @@ class MessageBoxView : public views::View {
   DISALLOW_COPY_AND_ASSIGN(MessageBoxView);
 };
 
+}  // namespace views
+
 #endif  // VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_
diff --git a/views/examples/message_box_example.cc b/views/examples/message_box_example.cc
index 0fa3777..f6e8ddb 100644
--- a/views/examples/message_box_example.cc
+++ b/views/examples/message_box_example.cc
@@ -4,6 +4,7 @@
 
 #include "views/examples/message_box_example.h"
 
+#include "views/controls/message_box_view.h"
 #include "views/layout/grid_layout.h"
 #include "views/view.h"
 
@@ -21,7 +22,7 @@ std::wstring MessageBoxExample::GetExampleTitle() {
 }
 
 void MessageBoxExample::CreateExampleView(views::View* container) {
-  message_box_view_ = new MessageBoxView(
+  message_box_view_ = new views::MessageBoxView(
       0, L"Message Box Message", L"Default Prompt");
   status_ = new views::TextButton(this, L"Show Status");
   toggle_ = new views::TextButton(this, L"Toggle Checkbox");
diff --git a/views/examples/message_box_example.h b/views/examples/message_box_example.h
index a8ecbb9..c43da02 100644
--- a/views/examples/message_box_example.h
+++ b/views/examples/message_box_example.h
@@ -11,9 +11,12 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/message_box_view.h"
 #include "views/examples/example_base.h"
 
+namespace views {
+class MessageBoxView;
+}
+
 namespace examples {
 
 // A MessageBoxView example. This tests some of checkbox features as well.
@@ -33,7 +36,7 @@ class MessageBoxExample : public ExampleBase,
                              const views::Event& event) OVERRIDE;
 
   // The MessageBoxView to be tested.
-  MessageBoxView* message_box_view_;
+  views::MessageBoxView* message_box_view_;
 
   // Control buttons to show the status and toggle checkbox in the
   // message box.