views: Move views/window/ to ui/views/window directory.

views/window/custom_frame_view.cc

Index: views/window/custom_frame_view.cc
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
deleted file mode 100644
index 989f3c55f2a557c01eeb2a0fc95ada11c2891316..0000000000000000000000000000000000000000
--- a/views/window/custom_frame_view.cc
+++ /dev/null
@@ -1,594 +0,0 @@
-// 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 "views/window/custom_frame_view.h"
-
-#include <algorithm>
-
-#include "base/utf_string_conversions.h"
-#include "grit/ui_resources.h"
-#include "grit/ui_strings.h"
-#include "ui/base/hit_test.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/font.h"
-#include "ui/gfx/path.h"
-#include "views/widget/widget_delegate.h"
-#include "views/window/client_view.h"
-#include "views/window/window_resources.h"
-#include "views/window/window_shape.h"
-
-#if defined(USE_AURA)
-#include "views/widget/native_widget_aura.h"
-#elif defined(OS_WIN)
-#include "views/widget/native_widget_win.h"
-#endif
-
-namespace views {
-
-// static
-gfx::Font* CustomFrameView::title_font_ = NULL;
-
-namespace {
-// The frame border is only visible in restored mode and is hardcoded to 4 px on
-// each side regardless of the system window border size.
-const int kFrameBorderThickness = 4;
-// Various edges of the frame border have a 1 px shadow along their edges; in a
-// few cases we shift elements based on this amount for visual appeal.
-const int kFrameShadowThickness = 1;
-// While resize areas on Windows are normally the same size as the window
-// borders, our top area is shrunk by 1 px to make it easier to move the window
-// around with our thinner top grabbable strip.  (Incidentally, our side and
-// bottom resize areas don't match the frame border thickness either -- they
-// span the whole nonclient area, so there's no "dead zone" for the mouse.)
-const int kTopResizeAdjust = 1;
-// In the window corners, the resize areas don't actually expand bigger, but the
-// 16 px at the end of each edge triggers diagonal resizing.
-const int kResizeAreaCornerSize = 16;
-// The titlebar never shrinks too short to show the caption button plus some
-// padding below it.
-const int kCaptionButtonHeightWithPadding = 19;
-// The titlebar has a 2 px 3D edge along the top and bottom.
-const int kTitlebarTopAndBottomEdgeThickness = 2;
-// The icon is inset 2 px from the left frame border.
-const int kIconLeftSpacing = 2;
-// The icon never shrinks below 16 px on a side.
-const int kIconMinimumSize = 16;
-// There is a 4 px gap between the icon and the title text.
-const int kIconTitleSpacing = 4;
-// There is a 5 px gap between the title text and the caption buttons.
-const int kTitleCaptionSpacing = 5;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomFrameView, public:
-
-CustomFrameView::CustomFrameView(Widget* frame)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(close_button_(new ImageButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(restore_button_(new ImageButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(maximize_button_(new ImageButton(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(minimize_button_(new ImageButton(this))),
-      window_icon_(NULL),
-      should_show_minmax_buttons_(false),
-      should_show_client_edge_(false),
-      frame_(frame) {
-  InitClass();
-
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-
-  close_button_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
-
-  // Close button images will be set in LayoutWindowControls().
-  AddChildView(close_button_);
-
-  restore_button_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_RESTORE));
-  restore_button_->SetImage(CustomButton::BS_NORMAL,
-                            rb.GetBitmapNamed(IDR_RESTORE));
-  restore_button_->SetImage(CustomButton::BS_HOT,
-                            rb.GetBitmapNamed(IDR_RESTORE_H));
-  restore_button_->SetImage(CustomButton::BS_PUSHED,
-                            rb.GetBitmapNamed(IDR_RESTORE_P));
-  AddChildView(restore_button_);
-
-  maximize_button_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE));
-  maximize_button_->SetImage(CustomButton::BS_NORMAL,
-                             rb.GetBitmapNamed(IDR_MAXIMIZE));
-  maximize_button_->SetImage(CustomButton::BS_HOT,
-                             rb.GetBitmapNamed(IDR_MAXIMIZE_H));
-  maximize_button_->SetImage(CustomButton::BS_PUSHED,
-                             rb.GetBitmapNamed(IDR_MAXIMIZE_P));
-  AddChildView(maximize_button_);
-
-  minimize_button_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE));
-  minimize_button_->SetImage(CustomButton::BS_NORMAL,
-                             rb.GetBitmapNamed(IDR_MINIMIZE));
-  minimize_button_->SetImage(CustomButton::BS_HOT,
-                             rb.GetBitmapNamed(IDR_MINIMIZE_H));
-  minimize_button_->SetImage(CustomButton::BS_PUSHED,
-                             rb.GetBitmapNamed(IDR_MINIMIZE_P));
-  AddChildView(minimize_button_);
-
-  should_show_minmax_buttons_ = frame_->widget_delegate()->CanMaximize();
-  should_show_client_edge_ = frame_->widget_delegate()->ShouldShowClientEdge();
-
-  if (frame_->widget_delegate()->ShouldShowWindowIcon()) {
-    window_icon_ = new ImageButton(this);
-    AddChildView(window_icon_);
-  }
-}
-
-CustomFrameView::~CustomFrameView() {
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomFrameView, NonClientFrameView implementation:
-
-gfx::Rect CustomFrameView::GetBoundsForClientView() const {
-  return client_view_bounds_;
-}
-
-gfx::Rect CustomFrameView::GetWindowBoundsForClientBounds(
-    const gfx::Rect& client_bounds) const {
-  int top_height = NonClientTopBorderHeight();
-  int border_thickness = NonClientBorderThickness();
-  return gfx::Rect(std::max(0, client_bounds.x() - border_thickness),
-                   std::max(0, client_bounds.y() - top_height),
-                   client_bounds.width() + (2 * border_thickness),
-                   client_bounds.height() + top_height + border_thickness);
-}
-
-int CustomFrameView::NonClientHitTest(const gfx::Point& point) {
-  // Sanity check.
-  if (!bounds().Contains(point))
-    return HTNOWHERE;
-
-  int frame_component = frame_->client_view()->NonClientHitTest(point);
-
-  // See if we're in the sysmenu region.  (We check the ClientView first to be
-  // consistent with OpaqueBrowserFrameView; it's not really necessary here.)
-  gfx::Rect sysmenu_rect(IconBounds());
-  // In maximized mode we extend the rect to the screen corner to take advantage
-  // of Fitts' Law.
-  if (frame_->IsMaximized())
-    sysmenu_rect.SetRect(0, 0, sysmenu_rect.right(), sysmenu_rect.bottom());
-  sysmenu_rect.set_x(GetMirroredXForRect(sysmenu_rect));
-  if (sysmenu_rect.Contains(point))
-    return (frame_component == HTCLIENT) ? HTCLIENT : HTSYSMENU;
-
-  if (frame_component != HTNOWHERE)
-    return frame_component;
-
-  // Then see if the point is within any of the window controls.
-  if (close_button_->GetMirroredBounds().Contains(point))
-    return HTCLOSE;
-  if (restore_button_->GetMirroredBounds().Contains(point))
-    return HTMAXBUTTON;
-  if (maximize_button_->GetMirroredBounds().Contains(point))
-    return HTMAXBUTTON;
-  if (minimize_button_->GetMirroredBounds().Contains(point))
-    return HTMINBUTTON;
-  if (window_icon_ && window_icon_->GetMirroredBounds().Contains(point))
-    return HTSYSMENU;
-
-  int window_component = GetHTComponentForFrame(point, FrameBorderThickness(),
-      NonClientBorderThickness(), kResizeAreaCornerSize, kResizeAreaCornerSize,
-      frame_->widget_delegate()->CanResize());
-  // Fall back to the caption if no other component matches.
-  return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
-}
-
-void CustomFrameView::GetWindowMask(const gfx::Size& size,
-                                    gfx::Path* window_mask) {
-  DCHECK(window_mask);
-  if (frame_->IsMaximized())
-    return;
-
-  views::GetDefaultWindowMask(size, window_mask);
-}
-
-void CustomFrameView::EnableClose(bool enable) {
-  close_button_->SetEnabled(enable);
-}
-
-void CustomFrameView::ResetWindowControls() {
-  restore_button_->SetState(CustomButton::BS_NORMAL);
-  minimize_button_->SetState(CustomButton::BS_NORMAL);
-  maximize_button_->SetState(CustomButton::BS_NORMAL);
-  // The close button isn't affected by this constraint.
-}
-
-void CustomFrameView::UpdateWindowIcon() {
-  window_icon_->SchedulePaint();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomFrameView, View overrides:
-
-void CustomFrameView::OnPaint(gfx::Canvas* canvas) {
-  if (frame_->IsMaximized())
-    PaintMaximizedFrameBorder(canvas);
-  else
-    PaintRestoredFrameBorder(canvas);
-  PaintTitleBar(canvas);
-  if (ShouldShowClientEdge())
-    PaintRestoredClientEdge(canvas);
-}
-
-void CustomFrameView::Layout() {
-  LayoutWindowControls();
-  LayoutTitleBar();
-  LayoutClientView();
-}
-
-gfx::Size CustomFrameView::GetPreferredSize() {
-  gfx::Size pref = frame_->client_view()->GetPreferredSize();
-  gfx::Rect bounds(0, 0, pref.width(), pref.height());
-  return frame_->non_client_view()->GetWindowBoundsForClientBounds(
-      bounds).size();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomFrameView, ButtonListener implementation:
-
-void CustomFrameView::ButtonPressed(Button* sender, const views::Event& event) {
-  if (sender == close_button_)
-    frame_->Close();
-  else if (sender == minimize_button_)
-    frame_->Minimize();
-  else if (sender == maximize_button_)
-    frame_->Maximize();
-  else if (sender == restore_button_)
-    frame_->Restore();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// CustomFrameView, private:
-
-int CustomFrameView::FrameBorderThickness() const {
-  return frame_->IsMaximized() ? 0 : kFrameBorderThickness;
-}
-
-int CustomFrameView::NonClientBorderThickness() const {
-  // In maximized mode, we don't show a client edge.
-  return FrameBorderThickness() +
-      (ShouldShowClientEdge() ? kClientEdgeThickness : 0);
-}
-
-int CustomFrameView::NonClientTopBorderHeight() const {
-  return std::max(FrameBorderThickness() + IconSize(),
-                  CaptionButtonY() + kCaptionButtonHeightWithPadding) +
-      TitlebarBottomThickness();
-}
-
-int CustomFrameView::CaptionButtonY() const {
-  // Maximized buttons start at window top so that even if their images aren't
-  // drawn flush with the screen edge, they still obey Fitts' Law.
-  return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness;
-}
-
-int CustomFrameView::TitlebarBottomThickness() const {
-  return kTitlebarTopAndBottomEdgeThickness +
-      (ShouldShowClientEdge() ? kClientEdgeThickness : 0);
-}
-
-int CustomFrameView::IconSize() const {
-#if defined(OS_WIN)
-  // This metric scales up if either the titlebar height or the titlebar font
-  // size are increased.
-  return GetSystemMetrics(SM_CYSMICON);
-#else
-  return std::max(title_font_->GetHeight(), kIconMinimumSize);
-#endif
-}
-
-bool CustomFrameView::ShouldShowClientEdge() const {
-  return should_show_client_edge_ && !frame_->IsMaximized();
-}
-
-gfx::Rect CustomFrameView::IconBounds() const {
-  int size = IconSize();
-  int frame_thickness = FrameBorderThickness();
-  // Our frame border has a different "3D look" than Windows'.  Theirs has a
-  // more complex gradient on the top that they push their icon/title below;
-  // then the maximized window cuts this off and the icon/title are centered
-  // in the remaining space.  Because the apparent shape of our border is
-  // simpler, using the same positioning makes things look slightly uncentered
-  // with restored windows, so when the window is restored, instead of
-  // calculating the remaining space from below the frame border, we calculate
-  // from below the 3D edge.
-  int unavailable_px_at_top = frame_->IsMaximized() ?
-      frame_thickness : kTitlebarTopAndBottomEdgeThickness;
-  // When the icon is shorter than the minimum space we reserve for the caption
-  // button, we vertically center it.  We want to bias rounding to put extra
-  // space above the icon, since the 3D edge (+ client edge, for restored
-  // windows) below looks (to the eye) more like additional space than does the
-  // 3D edge (or nothing at all, for maximized windows) above; hence the +1.
-  int y = unavailable_px_at_top + (NonClientTopBorderHeight() -
-      unavailable_px_at_top - size - TitlebarBottomThickness() + 1) / 2;
-  return gfx::Rect(frame_thickness + kIconLeftSpacing, y, size, size);
-}
-
-void CustomFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
-  // Window frame mode.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-
-  SkBitmap* frame_image;
-  SkColor frame_color;
-  if (frame_->IsActive()) {
-    frame_image = rb.GetBitmapNamed(IDR_FRAME);
-    frame_color = ResourceBundle::frame_color;
-  } else {
-    frame_image = rb.GetBitmapNamed(IDR_FRAME_INACTIVE);
-    frame_color = ResourceBundle::frame_color_inactive;
-  }
-
-  SkBitmap* top_left_corner = rb.GetBitmapNamed(IDR_WINDOW_TOP_LEFT_CORNER);
-  SkBitmap* top_right_corner =
-      rb.GetBitmapNamed(IDR_WINDOW_TOP_RIGHT_CORNER);
-  SkBitmap* top_edge = rb.GetBitmapNamed(IDR_WINDOW_TOP_CENTER);
-  SkBitmap* right_edge = rb.GetBitmapNamed(IDR_WINDOW_RIGHT_SIDE);
-  SkBitmap* left_edge = rb.GetBitmapNamed(IDR_WINDOW_LEFT_SIDE);
-  SkBitmap* bottom_left_corner =
-      rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER);
-  SkBitmap* bottom_right_corner =
-      rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER);
-  SkBitmap* bottom_edge = rb.GetBitmapNamed(IDR_WINDOW_BOTTOM_CENTER);
-
-  // Fill with the frame color first so we have a constant background for
-  // areas not covered by the theme image.
-  canvas->FillRect(frame_color,
-                   gfx::Rect(0, 0, width(), frame_image->height()));
-
-  int remaining_height = height() - frame_image->height();
-  if (remaining_height > 0) {
-    // Now fill down the sides.
-    canvas->FillRect(frame_color,
-                     gfx::Rect(0, frame_image->height(), left_edge->width(),
-                               remaining_height));
-    canvas->FillRect(frame_color,
-                     gfx::Rect(width() - right_edge->width(),
-                               frame_image->height(), right_edge->width(),
-                               remaining_height));
-    int center_width = width() - left_edge->width() - right_edge->width();
-    if (center_width > 0) {
-      // Now fill the bottom area.
-      canvas->FillRect(frame_color,
-                       gfx::Rect(left_edge->width(),
-                                 height() - bottom_edge->height(),
-                                 center_width, bottom_edge->height()));
-    }
-  }
-
-  // Draw the theme frame.
-  canvas->TileImageInt(*frame_image, 0, 0, width(), frame_image->height());
-
-  // Top.
-  canvas->DrawBitmapInt(*top_left_corner, 0, 0);
-  canvas->TileImageInt(*top_edge, top_left_corner->width(), 0,
-                       width() - top_right_corner->width(), top_edge->height());
-  canvas->DrawBitmapInt(*top_right_corner,
-                        width() - top_right_corner->width(), 0);
-
-  // Right.
-  canvas->TileImageInt(*right_edge, width() - right_edge->width(),
-      top_right_corner->height(), right_edge->width(),
-      height() - top_right_corner->height() - bottom_right_corner->height());
-
-  // Bottom.
-  canvas->DrawBitmapInt(*bottom_right_corner,
-                        width() - bottom_right_corner->width(),
-                        height() - bottom_right_corner->height());
-  canvas->TileImageInt(*bottom_edge, bottom_left_corner->width(),
-      height() - bottom_edge->height(),
-      width() - bottom_left_corner->width() - bottom_right_corner->width(),
-      bottom_edge->height());
-  canvas->DrawBitmapInt(*bottom_left_corner, 0,
-                        height() - bottom_left_corner->height());
-
-  // Left.
-  canvas->TileImageInt(*left_edge, 0, top_left_corner->height(),
-      left_edge->width(),
-      height() - top_left_corner->height() - bottom_left_corner->height());
-}
-
-void CustomFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-
-  SkBitmap* frame_image = rb.GetBitmapNamed(frame_->IsActive() ?
-      IDR_FRAME : IDR_FRAME_INACTIVE);
-  canvas->TileImageInt(*frame_image, 0, FrameBorderThickness(), width(),
-                       frame_image->height());
-
-  // The bottom of the titlebar actually comes from the top of the Client Edge
-  // graphic, with the actual client edge clipped off the bottom.
-  SkBitmap* titlebar_bottom = rb.GetBitmapNamed(IDR_APP_TOP_CENTER);
-  int edge_height = titlebar_bottom->height() -
-                    (ShouldShowClientEdge() ? kClientEdgeThickness : 0);
-  canvas->TileImageInt(*titlebar_bottom, 0,
-      frame_->client_view()->y() - edge_height, width(), edge_height);
-}
-
-void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) {
-  WidgetDelegate* d = frame_->widget_delegate();
-
-  // It seems like in some conditions we can be asked to paint after the window
-  // that contains us is WM_DESTROYed. At this point, our delegate is NULL. The
-  // correct long term fix may be to shut down the RootView in WM_DESTROY.
-  if (!d)
-    return;
-
-  canvas->DrawStringInt(d->GetWindowTitle(), *title_font_,
-                        SK_ColorWHITE, GetMirroredXForRect(title_bounds_),
-                        title_bounds_.y(), title_bounds_.width(),
-                        title_bounds_.height());
-}
-
-void CustomFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
-  gfx::Rect client_area_bounds = frame_->client_view()->bounds();
-  int client_area_top = client_area_bounds.y();
-
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  SkBitmap* top_left = rb.GetBitmapNamed(IDR_APP_TOP_LEFT);
-  SkBitmap* top = rb.GetBitmapNamed(IDR_APP_TOP_CENTER);
-  SkBitmap* top_right = rb.GetBitmapNamed(IDR_APP_TOP_RIGHT);
-  SkBitmap* right = rb.GetBitmapNamed(IDR_CONTENT_RIGHT_SIDE);
-  SkBitmap* bottom_right =
-      rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER);
-  SkBitmap* bottom = rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_CENTER);
-  SkBitmap* bottom_left =
-      rb.GetBitmapNamed(IDR_CONTENT_BOTTOM_LEFT_CORNER);
-  SkBitmap* left = rb.GetBitmapNamed(IDR_CONTENT_LEFT_SIDE);
-
-  // Top.
-  int top_edge_y = client_area_top - top->height();
-  canvas->DrawBitmapInt(*top_left, client_area_bounds.x() - top_left->width(),
-                        top_edge_y);
-  canvas->TileImageInt(*top, client_area_bounds.x(), top_edge_y,
-                       client_area_bounds.width(), top->height());
-  canvas->DrawBitmapInt(*top_right, client_area_bounds.right(), top_edge_y);
-
-  // Right.
-  int client_area_bottom =
-      std::max(client_area_top, client_area_bounds.bottom());
-  int client_area_height = client_area_bottom - client_area_top;
-  canvas->TileImageInt(*right, client_area_bounds.right(), client_area_top,
-                       right->width(), client_area_height);
-
-  // Bottom.
-  canvas->DrawBitmapInt(*bottom_right, client_area_bounds.right(),
-                        client_area_bottom);
-  canvas->TileImageInt(*bottom, client_area_bounds.x(), client_area_bottom,
-                       client_area_bounds.width(), bottom_right->height());
-  canvas->DrawBitmapInt(*bottom_left,
-      client_area_bounds.x() - bottom_left->width(), client_area_bottom);
-
-  // Left.
-  canvas->TileImageInt(*left, client_area_bounds.x() - left->width(),
-      client_area_top, left->width(), client_area_height);
-
-  // Draw the toolbar color to fill in the edges.
-  canvas->DrawRectInt(ResourceBundle::toolbar_color,
-    client_area_bounds.x() - 1, client_area_top - 1,
-    client_area_bounds.width() + 1, client_area_bottom - client_area_top + 1);
-}
-
-void CustomFrameView::LayoutWindowControls() {
-  close_button_->SetImageAlignment(ImageButton::ALIGN_LEFT,
-                                   ImageButton::ALIGN_BOTTOM);
-  int caption_y = CaptionButtonY();
-  bool is_maximized = frame_->IsMaximized();
-  // There should always be the same number of non-shadow pixels visible to the
-  // side of the caption buttons.  In maximized mode we extend the rightmost
-  // button to the screen corner to obey Fitts' Law.
-  int right_extra_width = is_maximized ?
-      (kFrameBorderThickness - kFrameShadowThickness) : 0;
-  gfx::Size close_button_size = close_button_->GetPreferredSize();
-  close_button_->SetBounds(width() - FrameBorderThickness() -
-      right_extra_width - close_button_size.width(), caption_y,
-      close_button_size.width() + right_extra_width,
-      close_button_size.height());
-
-  // When the window is restored, we show a maximized button; otherwise, we show
-  // a restore button.
-  bool is_restored = !is_maximized && !frame_->IsMinimized();
-  views::ImageButton* invisible_button = is_restored ?
-      restore_button_ : maximize_button_;
-  invisible_button->SetVisible(false);
-
-  views::ImageButton* visible_button = is_restored ?
-      maximize_button_ : restore_button_;
-  FramePartBitmap normal_part, hot_part, pushed_part;
-  if (should_show_minmax_buttons_) {
-    visible_button->SetVisible(true);
-    visible_button->SetImageAlignment(ImageButton::ALIGN_LEFT,
-                                      ImageButton::ALIGN_BOTTOM);
-    gfx::Size visible_button_size = visible_button->GetPreferredSize();
-    visible_button->SetBounds(close_button_->x() - visible_button_size.width(),
-                              caption_y, visible_button_size.width(),
-                              visible_button_size.height());
-
-    minimize_button_->SetVisible(true);
-    minimize_button_->SetImageAlignment(ImageButton::ALIGN_LEFT,
-                                        ImageButton::ALIGN_BOTTOM);
-    gfx::Size minimize_button_size = minimize_button_->GetPreferredSize();
-    minimize_button_->SetBounds(
-        visible_button->x() - minimize_button_size.width(), caption_y,
-        minimize_button_size.width(),
-        minimize_button_size.height());
-
-    normal_part = IDR_CLOSE;
-    hot_part = IDR_CLOSE_H;
-    pushed_part = IDR_CLOSE_P;
-  } else {
-    visible_button->SetVisible(false);
-    minimize_button_->SetVisible(false);
-
-    normal_part = IDR_CLOSE_SA;
-    hot_part = IDR_CLOSE_SA_H;
-    pushed_part = IDR_CLOSE_SA_P;
-  }
-
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-
-  close_button_->SetImage(CustomButton::BS_NORMAL,
-                          rb.GetBitmapNamed(normal_part));
-  close_button_->SetImage(CustomButton::BS_HOT,
-                          rb.GetBitmapNamed(hot_part));
-  close_button_->SetImage(CustomButton::BS_PUSHED,
-                          rb.GetBitmapNamed(pushed_part));
-}
-
-void CustomFrameView::LayoutTitleBar() {
-  // The window title is based on the calculated icon position, even when there
-  // is no icon.
-  gfx::Rect icon_bounds(IconBounds());
-  if (frame_->widget_delegate()->ShouldShowWindowIcon())
-    window_icon_->SetBoundsRect(icon_bounds);
-
-  // Size the title.
-  int title_x = frame_->widget_delegate()->ShouldShowWindowIcon() ?
-      icon_bounds.right() + kIconTitleSpacing : icon_bounds.x();
-  int title_height = title_font_->GetHeight();
-  // We bias the title position so that when the difference between the icon and
-  // title heights is odd, the extra pixel of the title is above the vertical
-  // midline rather than below.  This compensates for how the icon is already
-  // biased downwards (see IconBounds()) and helps prevent descenders on the
-  // title from overlapping the 3D edge at the bottom of the titlebar.
-  title_bounds_.SetRect(title_x,
-      icon_bounds.y() + ((icon_bounds.height() - title_height - 1) / 2),
-      std::max(0, (should_show_minmax_buttons_ ?
-          minimize_button_->x() : close_button_->x()) - kTitleCaptionSpacing -
-      title_x), title_height);
-}
-
-void CustomFrameView::LayoutClientView() {
-  int top_height = NonClientTopBorderHeight();
-  int border_thickness = NonClientBorderThickness();
-  client_view_bounds_.SetRect(border_thickness, top_height,
-      std::max(0, width() - (2 * border_thickness)),
-      std::max(0, height() - top_height - border_thickness));
-}
-
-// static
-void CustomFrameView::InitClass() {
-  static bool initialized = false;
-  if (!initialized) {
-#if defined(USE_AURA)
-    title_font_ = new gfx::Font(NativeWidgetAura::GetWindowTitleFont());
-#elif defined(OS_WIN)
-    title_font_ = new gfx::Font(NativeWidgetWin::GetWindowTitleFont());
-#elif defined(OS_LINUX)
-    // TODO(ben): need to resolve what font this is.
-    title_font_ = new gfx::Font();
-#endif
-    initialized = true;
-  }
-}
-
-}  // namespace views