Move ash/wm's DialogFrameView to ui/views/window; etc.

ui/views/window/dialog_frame_view.cc

 // Copyright (c) 2012 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 "ash/wm/dialog_frame_view.h"
+#include "ui/views/window/dialog_frame_view.h"
 
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
@@ skipping 26 matching lines @@
 const int kDialogTopPaddingNudge = 5;
 const int kDialogBottomPaddingNudge = 10;
 
 // TODO(benrg): There are no examples in the spec of close boxes on medium- or
 // small-size dialogs, and the close button size is not factored into other
 // sizing decisions. This value could cause problems with smaller dialogs.
 const int kCloseButtonSize = 44;
 
 }  // namespace
 
-namespace ash {
-namespace internal {
+namespace views {
 
 // static
-const char DialogFrameView::kViewClassName[] = "ash/wm/DialogFrameView";
+const char DialogFrameView::kViewClassName[] = "ui/views/DialogFrameView";
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogFrameView, public:
 
 DialogFrameView::DialogFrameView() {
-  set_background(views::Background::CreateSolidBackground(
-      kDialogBackgroundColor));
+  set_background(Background::CreateSolidBackground(kDialogBackgroundColor));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   title_font_.reset(new gfx::Font(rb.GetFont(ui::ResourceBundle::MediumFont)));
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(views::CustomButton::STATE_NORMAL,
       rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());
-  close_button_->SetImage(views::CustomButton::STATE_HOVERED,
+  close_button_->SetImage(CustomButton::STATE_HOVERED,
       rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
-  close_button_->SetImage(views::CustomButton::STATE_PRESSED,
+  close_button_->SetImage(CustomButton::STATE_PRESSED,
       rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
-  close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
-                                   views::ImageButton::ALIGN_MIDDLE);
+  close_button_->SetImageAlignment(ImageButton::ALIGN_CENTER,
+                                   ImageButton::ALIGN_MIDDLE);
   AddChildView(close_button_);
 }
 
 DialogFrameView::~DialogFrameView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DialogFrameView, views::NonClientFrameView:
+// DialogFrameView, NonClientFrameView:
 
 gfx::Rect DialogFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = GetLocalBounds();
   client_bounds.Inset(GetClientInsets());
   return client_bounds;
 }
 
 gfx::Rect DialogFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Rect window_bounds = client_bounds;
@@ skipping 18 matching lines @@
 
 void DialogFrameView::UpdateWindowIcon() {
   // Nothing to do.
 }
 
 void DialogFrameView::UpdateWindowTitle() {
   // Nothing to do.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DialogFrameView, views::View overrides:
+// DialogFrameView, View overrides:
 
 std::string DialogFrameView::GetClassName() const {
   return kViewClassName;
 }
 
 void DialogFrameView::Layout() {
   title_display_rect_ = GetLocalBounds();
   title_display_rect_.Inset(GetPaddingInsets());
   title_display_rect_.set_height(title_font_->GetHeight());
 
   // The hot rectangle for the close button is flush with the upper right of the
   // dialog. The close button image is smaller, and is centered in the hot rect.
   close_button_->SetBounds(
       width() - kCloseButtonSize,
       0, kCloseButtonSize, kCloseButtonSize);
 }
 
 void DialogFrameView::OnPaint(gfx::Canvas* canvas) {
-  views::View::OnPaint(canvas);
-  views::WidgetDelegate* delegate = GetWidget()->widget_delegate();
+  View::OnPaint(canvas);
+  WidgetDelegate* delegate = GetWidget()->widget_delegate();
   if (!delegate)
     return;
   canvas->DrawStringInt(delegate->GetWindowTitle(), *title_font_.get(),
                         kDialogTitleColor, title_display_rect_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DialogFrameView, views::ButtonListener overrides:
+// DialogFrameView, ButtonListener overrides:
 
-void DialogFrameView::ButtonPressed(views::Button* sender,
-                                    const ui::Event& event) {
+void DialogFrameView::ButtonPressed(Button* sender, const ui::Event& event) {
   if (sender == close_button_)
     GetWidget()->Close();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogFrameView, private:
 
 gfx::Insets DialogFrameView::GetPaddingInsets() const {
   // These three discrete padding sizes come from the spec. If we ever wanted
   // our Google-style dialogs to be resizable, we would probably need to
@@ skipping 18 matching lines @@
   // and one em is equal to the font size (CSS spec).
   insets += gfx::Insets(
       title_font_->GetHeight() + title_font_->GetFontSize() -
           kDialogTopPaddingNudge,
       -kDialogHPaddingNudge,
       -kDialogBottomPaddingNudge,
       -kDialogHPaddingNudge);
   return insets;
 }
 
-}  // namespace internal
 }  // namespace views