Support DWM switching....

chrome/browser/views/frame/opaque_non_client_view.cc

Index: chrome/browser/views/frame/opaque_non_client_view.cc
===================================================================
--- chrome/browser/views/frame/opaque_non_client_view.cc	(revision 10688)
+++ chrome/browser/views/frame/opaque_non_client_view.cc	(working copy)
@@ -1,1070 +0,0 @@
-// Copyright (c) 2006-2008 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/views/frame/opaque_non_client_view.h"
-
-#include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/common/gfx/chrome_font.h"
-#include "chrome/common/gfx/path.h"
-#include "chrome/common/l10n_util.h"
-#include "chrome/common/resource_bundle.h"
-#include "chrome/common/win_util.h"
-#include "chrome/views/root_view.h"
-#include "chrome/views/window_resources.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
-
-// An enumeration of bitmap resources used by this window.
-enum {
-  // Window Controls.
-  FRAME_CLOSE_BUTTON_ICON,
-  FRAME_CLOSE_BUTTON_ICON_H,
-  FRAME_CLOSE_BUTTON_ICON_P,
-  FRAME_CLOSE_BUTTON_ICON_SA,
-  FRAME_CLOSE_BUTTON_ICON_SA_H,
-  FRAME_CLOSE_BUTTON_ICON_SA_P,
-  FRAME_RESTORE_BUTTON_ICON,
-  FRAME_RESTORE_BUTTON_ICON_H,
-  FRAME_RESTORE_BUTTON_ICON_P,
-  FRAME_MAXIMIZE_BUTTON_ICON,
-  FRAME_MAXIMIZE_BUTTON_ICON_H,
-  FRAME_MAXIMIZE_BUTTON_ICON_P,
-  FRAME_MINIMIZE_BUTTON_ICON,
-  FRAME_MINIMIZE_BUTTON_ICON_H,
-  FRAME_MINIMIZE_BUTTON_ICON_P,
-
-  // Window Frame Border.
-  FRAME_BOTTOM_EDGE,
-  FRAME_BOTTOM_LEFT_CORNER,
-  FRAME_BOTTOM_RIGHT_CORNER,
-  FRAME_LEFT_EDGE,
-  FRAME_RIGHT_EDGE,
-  FRAME_TOP_EDGE,
-  FRAME_TOP_LEFT_CORNER,
-  FRAME_TOP_RIGHT_CORNER,
-
-  // Client Edge Border.
-  FRAME_CLIENT_EDGE_TOP_LEFT,
-  FRAME_CLIENT_EDGE_TOP,
-  FRAME_CLIENT_EDGE_TOP_RIGHT,
-  FRAME_CLIENT_EDGE_RIGHT,
-  FRAME_CLIENT_EDGE_BOTTOM_RIGHT,
-  FRAME_CLIENT_EDGE_BOTTOM,
-  FRAME_CLIENT_EDGE_BOTTOM_LEFT,
-  FRAME_CLIENT_EDGE_LEFT,
-
-  // No-toolbar client edge.
-  FRAME_NO_TOOLBAR_TOP_LEFT,
-  FRAME_NO_TOOLBAR_TOP_CENTER,
-  FRAME_NO_TOOLBAR_TOP_RIGHT,
-
-  FRAME_PART_BITMAP_COUNT  // Must be last.
-};
-
-class ActiveWindowResources : public views::WindowResources {
- public:
-  ActiveWindowResources() {
-    InitClass();
-  }
-  virtual ~ActiveWindowResources() { }
-
-  // WindowResources implementation:
-  virtual SkBitmap* GetPartBitmap(views::FramePartBitmap part) const {
-    return standard_frame_bitmaps_[part];
-  }
-
- private:
-  static void InitClass() {
-    static bool initialized = false;
-    if (!initialized) {
-      static const int kFramePartBitmapIds[] = {
-        IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P,
-        IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
-        IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P,
-        IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P,
-        IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
-        IDR_WINDOW_BOTTOM_CENTER, IDR_WINDOW_BOTTOM_LEFT_CORNER,
-            IDR_WINDOW_BOTTOM_RIGHT_CORNER, IDR_WINDOW_LEFT_SIDE,
-            IDR_WINDOW_RIGHT_SIDE, IDR_WINDOW_TOP_CENTER,
-            IDR_WINDOW_TOP_LEFT_CORNER, IDR_WINDOW_TOP_RIGHT_CORNER,
-        IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
-            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
-            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
-        IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-      };
-
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i)
-        standard_frame_bitmaps_[i] = rb.GetBitmapNamed(kFramePartBitmapIds[i]);
-      initialized = true;
-    }
-  }
-
-  static SkBitmap* standard_frame_bitmaps_[FRAME_PART_BITMAP_COUNT];
-
-  DISALLOW_EVIL_CONSTRUCTORS(ActiveWindowResources);
-};
-
-class InactiveWindowResources : public views::WindowResources {
- public:
-  InactiveWindowResources() {
-    InitClass();
-  }
-  virtual ~InactiveWindowResources() { }
-
-  // WindowResources implementation:
-  virtual SkBitmap* GetPartBitmap(views::FramePartBitmap part) const {
-    return standard_frame_bitmaps_[part];
-  }
-
- private:
-  static void InitClass() {
-    static bool initialized = false;
-    if (!initialized) {
-      static const int kFramePartBitmapIds[] = {
-        IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P,
-        IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
-        IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P,
-        IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P,
-        IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
-        IDR_DEWINDOW_BOTTOM_CENTER, IDR_DEWINDOW_BOTTOM_LEFT_CORNER,
-            IDR_DEWINDOW_BOTTOM_RIGHT_CORNER, IDR_DEWINDOW_LEFT_SIDE,
-            IDR_DEWINDOW_RIGHT_SIDE, IDR_DEWINDOW_TOP_CENTER,
-            IDR_DEWINDOW_TOP_LEFT_CORNER, IDR_DEWINDOW_TOP_RIGHT_CORNER,
-        IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
-            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
-            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
-        IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-      };
-
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i)
-        standard_frame_bitmaps_[i] = rb.GetBitmapNamed(kFramePartBitmapIds[i]);
-      initialized = true;
-    }
-  }
-
-  static SkBitmap* standard_frame_bitmaps_[FRAME_PART_BITMAP_COUNT];
-
-  DISALLOW_EVIL_CONSTRUCTORS(InactiveWindowResources);
-};
-
-class OTRActiveWindowResources : public views::WindowResources {
- public:
-  OTRActiveWindowResources() {
-    InitClass();
-  }
-  virtual ~OTRActiveWindowResources() { }
-
-  // WindowResources implementation:
-  virtual SkBitmap* GetPartBitmap(views::FramePartBitmap part) const {
-    return standard_frame_bitmaps_[part];
-  }
-  
- private:
-  static void InitClass() {
-    static bool initialized = false;
-    if (!initialized) {
-      static const int kFramePartBitmapIds[] = {
-        IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P,
-        IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
-        IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P,
-        IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P,
-        IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
-        IDR_WINDOW_BOTTOM_CENTER_OTR, IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR,
-            IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_WINDOW_LEFT_SIDE_OTR,
-            IDR_WINDOW_RIGHT_SIDE_OTR, IDR_WINDOW_TOP_CENTER_OTR,
-            IDR_WINDOW_TOP_LEFT_CORNER_OTR, IDR_WINDOW_TOP_RIGHT_CORNER_OTR,
-        IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
-            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
-            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
-        IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-      };
-
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i)
-        standard_frame_bitmaps_[i] = rb.GetBitmapNamed(kFramePartBitmapIds[i]);
-      initialized = true;
-    }
-  }
-
-  static SkBitmap* standard_frame_bitmaps_[FRAME_PART_BITMAP_COUNT];
-
-  DISALLOW_EVIL_CONSTRUCTORS(OTRActiveWindowResources);
-};
-
-class OTRInactiveWindowResources : public views::WindowResources {
- public:
-  OTRInactiveWindowResources() {
-    InitClass();
-  }
-  virtual ~OTRInactiveWindowResources() { }
-
-  // WindowResources implementation:
-  virtual SkBitmap* GetPartBitmap(views::FramePartBitmap part) const {
-    return standard_frame_bitmaps_[part];
-  }
-
- private:
-  static void InitClass() {
-    static bool initialized = false;
-    if (!initialized) {
-      static const int kFramePartBitmapIds[] = {
-        IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P,
-        IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P,
-        IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P,
-        IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P,
-        IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
-        IDR_DEWINDOW_BOTTOM_CENTER_OTR, IDR_DEWINDOW_BOTTOM_LEFT_CORNER_OTR,
-            IDR_DEWINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_DEWINDOW_LEFT_SIDE_OTR,
-            IDR_DEWINDOW_RIGHT_SIDE_OTR, IDR_DEWINDOW_TOP_CENTER_OTR,
-            IDR_DEWINDOW_TOP_LEFT_CORNER_OTR,
-            IDR_DEWINDOW_TOP_RIGHT_CORNER_OTR,
-        IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
-            IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
-            IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
-            IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
-        IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-      };
-
-      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-      for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i)
-        standard_frame_bitmaps_[i] = rb.GetBitmapNamed(kFramePartBitmapIds[i]);
-      initialized = true;
-    }
-  }
-
-  static SkBitmap* standard_frame_bitmaps_[FRAME_PART_BITMAP_COUNT];
-
-  DISALLOW_EVIL_CONSTRUCTORS(OTRInactiveWindowResources);
-};
-
-// static
-SkBitmap* ActiveWindowResources::standard_frame_bitmaps_[];
-SkBitmap* InactiveWindowResources::standard_frame_bitmaps_[];
-SkBitmap* OTRActiveWindowResources::standard_frame_bitmaps_[];
-SkBitmap* OTRInactiveWindowResources::standard_frame_bitmaps_[];
-
-views::WindowResources* OpaqueNonClientView::active_resources_ = NULL;
-views::WindowResources* OpaqueNonClientView::inactive_resources_ = NULL;
-views::WindowResources* OpaqueNonClientView::active_otr_resources_ = NULL;
-views::WindowResources* OpaqueNonClientView::inactive_otr_resources_ = NULL;
-SkBitmap* OpaqueNonClientView::distributor_logo_ = NULL;
-ChromeFont OpaqueNonClientView::title_font_;
-
-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;
-// Besides the frame border, there's another 11 px of empty space atop the
-// window in restored mode, to use to drag the window around.
-const int kNonClientRestoredExtraThickness = 11;
-// 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 to less than 18 px tall, plus the height of the
-// frame border and any bottom edge.
-const int kTitlebarMinimumHeight = 18;
-// The icon is inset 2 px from the left frame border.
-const int kIconLeftSpacing = 2;
-// The icon takes up 16/25th of the available titlebar height.  (This is
-// expressed as two ints to avoid precision losses leading to off-by-one pixel
-// errors.)
-const int kIconHeightFractionNumerator = 16;
-const int kIconHeightFractionDenominator = 25;
-// The icon never shrinks below 16 px on a side.
-const int kIconMinimumSize = 16;
-// Because our frame border has a different "3D look" than Windows', with a less
-// cluttered top edge, we need to shift the icon up by 1 px in restored mode so
-// it looks more centered.
-const int kIconRestoredAdjust = 1;
-// There is a 4 px gap between the icon and the title text.
-const int kIconTitleSpacing = 4;
-// The title text starts 2 px below the bottom of the top frame border.
-const int kTitleTopSpacing = 2;
-// There is a 5 px gap between the title text and the distributor logo (if
-// present) or caption buttons.
-const int kTitleLogoSpacing = 5;
-// In maximized mode, the OTR avatar starts 2 px below the top of the screen, so
-// that it doesn't extend into the "3D edge" portion of the titlebar.
-const int kOTRMaximizedTopSpacing = 2;
-// The OTR avatar ends 2 px above the bottom of the tabstrip (which, given the
-// way the tabstrip draws its bottom edge, will appear like a 1 px gap to the
-// user).
-const int kOTRBottomSpacing = 2;
-// There are 2 px on each side of the OTR avatar (between the frame border and
-// it on the left, and between it and the tabstrip on the right).
-const int kOTRSideSpacing = 2;
-// In restored mode, the New Tab button isn't at the same height as the caption
-// buttons, but the space will look cluttered if it actually slides under them,
-// so we stop it when the gap between the two is down to 5 px.
-const int kNewTabCaptionRestoredSpacing = 5;
-// In maximized mode, where the New Tab button and the caption buttons are at
-// similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid
-// looking too cluttered.
-const int kNewTabCaptionMaximizedSpacing = 16;
-// When there's a distributor logo, we leave a 7 px gap between it and the
-// caption buttons.
-const int kLogoCaptionSpacing = 7;
-// The caption buttons are always drawn 1 px down from the visible top of the
-// window (the true top in restored mode, or the top of the screen in maximized
-// mode).
-const int kCaptionTopSpacing = 1;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OpaqueNonClientView, public:
-
-OpaqueNonClientView::OpaqueNonClientView(OpaqueFrame* frame,
-                                         BrowserView* browser_view)
-    : NonClientView(),
-      minimize_button_(new views::Button),
-      maximize_button_(new views::Button),
-      restore_button_(new views::Button),
-      close_button_(new views::Button),
-      window_icon_(NULL),
-      frame_(frame),
-      browser_view_(browser_view) {
-  InitClass();
-  if (browser_view->IsOffTheRecord()) {
-    if (!active_otr_resources_) {
-      // Lazy load OTR resources only when we first show an OTR frame.
-      active_otr_resources_ = new OTRActiveWindowResources;
-      inactive_otr_resources_ = new OTRInactiveWindowResources;
-    }
-    current_active_resources_ = active_otr_resources_;
-    current_inactive_resources_= inactive_otr_resources_;
-  } else {
-    current_active_resources_ = active_resources_;
-    current_inactive_resources_ = inactive_resources_;
-  }
-
-  views::WindowResources* resources = current_active_resources_;
-  minimize_button_->SetImage(
-      views::Button::BS_NORMAL,
-      resources->GetPartBitmap(FRAME_MINIMIZE_BUTTON_ICON));
-  minimize_button_->SetImage(
-      views::Button::BS_HOT,
-      resources->GetPartBitmap(FRAME_MINIMIZE_BUTTON_ICON_H));
-  minimize_button_->SetImage(
-      views::Button::BS_PUSHED,
-      resources->GetPartBitmap(FRAME_MINIMIZE_BUTTON_ICON_P));
-  minimize_button_->SetListener(this, -1);
-  minimize_button_->SetAccessibleName(
-      l10n_util::GetString(IDS_ACCNAME_MINIMIZE));
-  AddChildView(minimize_button_);
-
-  maximize_button_->SetImage(
-      views::Button::BS_NORMAL,
-      resources->GetPartBitmap(FRAME_MAXIMIZE_BUTTON_ICON));
-  maximize_button_->SetImage(
-      views::Button::BS_HOT,
-      resources->GetPartBitmap(FRAME_MAXIMIZE_BUTTON_ICON_H));
-  maximize_button_->SetImage(
-      views::Button::BS_PUSHED,
-      resources->GetPartBitmap(FRAME_MAXIMIZE_BUTTON_ICON_P));
-  maximize_button_->SetListener(this, -1);
-  maximize_button_->SetAccessibleName(
-      l10n_util::GetString(IDS_ACCNAME_MAXIMIZE));
-  AddChildView(maximize_button_);
-
-  restore_button_->SetImage(
-      views::Button::BS_NORMAL,
-      resources->GetPartBitmap(FRAME_RESTORE_BUTTON_ICON));
-  restore_button_->SetImage(
-      views::Button::BS_HOT,
-      resources->GetPartBitmap(FRAME_RESTORE_BUTTON_ICON_H));
-  restore_button_->SetImage(
-      views::Button::BS_PUSHED,
-      resources->GetPartBitmap(FRAME_RESTORE_BUTTON_ICON_P));
-  restore_button_->SetListener(this, -1);
-  restore_button_->SetAccessibleName(
-      l10n_util::GetString(IDS_ACCNAME_RESTORE));
-  AddChildView(restore_button_);
-
-  close_button_->SetImage(
-      views::Button::BS_NORMAL,
-      resources->GetPartBitmap(FRAME_CLOSE_BUTTON_ICON));
-  close_button_->SetImage(
-      views::Button::BS_HOT,
-      resources->GetPartBitmap(FRAME_CLOSE_BUTTON_ICON_H));
-  close_button_->SetImage(
-      views::Button::BS_PUSHED,
-      resources->GetPartBitmap(FRAME_CLOSE_BUTTON_ICON_P));
-  close_button_->SetListener(this, -1);
-  close_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_CLOSE));
-  AddChildView(close_button_);
-
-  // Initializing the TabIconView is expensive, so only do it if we need to.
-  if (browser_view_->ShouldShowWindowIcon()) {
-    window_icon_ = new TabIconView(this);
-    window_icon_->set_is_light(true);
-    AddChildView(window_icon_);
-    window_icon_->Update();
-  }
-  // Only load the title font if we're going to need to use it to paint.
-  // Loading fonts is expensive.
-  if (browser_view_->ShouldShowWindowTitle())
-    InitAppWindowResources();
-}
-
-OpaqueNonClientView::~OpaqueNonClientView() {
-}
-
-gfx::Rect OpaqueNonClientView::GetWindowBoundsForClientBounds(
-    const gfx::Rect& client_bounds) {
-  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);
-}
-
-gfx::Rect OpaqueNonClientView::GetBoundsForTabStrip(TabStrip* tabstrip) {
-  int tabstrip_x = browser_view_->ShouldShowOffTheRecordAvatar() ?
-      (otr_avatar_bounds_.right() + kOTRSideSpacing) :
-      NonClientBorderThickness();
-  int tabstrip_width = minimize_button_->x() - tabstrip_x -
-      (frame_->IsMaximized() ?
-      kNewTabCaptionMaximizedSpacing : kNewTabCaptionRestoredSpacing);
-  return gfx::Rect(tabstrip_x, NonClientTopBorderHeight(),
-                   std::max(0, tabstrip_width), tabstrip->GetPreferredHeight());
-}
-
-void OpaqueNonClientView::UpdateWindowIcon() {
-  if (window_icon_)
-    window_icon_->Update();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OpaqueNonClientView, views::NonClientView implementation:
-
-gfx::Rect OpaqueNonClientView::CalculateClientAreaBounds(int width,
-                                                         int height) const {
-  int top_height = NonClientTopBorderHeight();
-  int border_thickness = NonClientBorderThickness();
-  return gfx::Rect(border_thickness, top_height,
-                   std::max(0, width - (2 * border_thickness)),
-                   std::max(0, height - top_height - border_thickness));
-}
-
-gfx::Size OpaqueNonClientView::CalculateWindowSizeForClientSize(
-    int width,
-    int height) const {
-  int border_thickness = NonClientBorderThickness();
-  return gfx::Size(width + (2 * border_thickness),
-                   height + NonClientTopBorderHeight() + border_thickness);
-}
-
-gfx::Point OpaqueNonClientView::GetSystemMenuPoint() const {
-  gfx::Point system_menu_point(FrameBorderThickness(),
-      NonClientTopBorderHeight() + browser_view_->GetTabStripHeight() -
-      (browser_view_->IsFullscreen() ? 0 : kClientEdgeThickness));
-  ConvertPointToScreen(this, &system_menu_point);
-  return system_menu_point;
-}
-
-int OpaqueNonClientView::NonClientHitTest(const gfx::Point& point) {
-  if (!bounds().Contains(point))
-    return HTNOWHERE;
-
-  int frame_component = frame_->client_view()->NonClientHitTest(point);
-  if (frame_component != HTNOWHERE)
-    return frame_component;
-
-  // Then see if the point is within any of the window controls.
-  if (close_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(point))
-    return HTCLOSE;
-  if (restore_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
-      point))
-    return HTMAXBUTTON;
-  if (maximize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
-      point))
-    return HTMAXBUTTON;
-  if (minimize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
-      point))
-    return HTMINBUTTON;
-  if (window_icon_ &&
-      window_icon_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(point))
-    return HTSYSMENU;
-
-  int window_component = GetHTComponentForFrame(point, TopResizeHeight(),
-      NonClientBorderThickness(), kResizeAreaCornerSize, kResizeAreaCornerSize,
-      frame_->window_delegate()->CanResize());
-  // Fall back to the caption if no other component matches.
-  return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
-}
-
-void OpaqueNonClientView::GetWindowMask(const gfx::Size& size,
-                                        gfx::Path* window_mask) {
-  DCHECK(window_mask);
-
-  if (browser_view_->IsFullscreen())
-    return;
-
-  // Redefine the window visible region for the new size.
-  window_mask->moveTo(0, 3);
-  window_mask->lineTo(1, 2);
-  window_mask->lineTo(1, 1);
-  window_mask->lineTo(2, 1);
-  window_mask->lineTo(3, 0);
-
-  window_mask->lineTo(SkIntToScalar(size.width() - 3), 0);
-  window_mask->lineTo(SkIntToScalar(size.width() - 2), 1);
-  window_mask->lineTo(SkIntToScalar(size.width() - 1), 1);
-  window_mask->lineTo(SkIntToScalar(size.width() - 1), 2);
-  window_mask->lineTo(SkIntToScalar(size.width()), 3);
-
-  window_mask->lineTo(SkIntToScalar(size.width()),
-                      SkIntToScalar(size.height()));
-  window_mask->lineTo(0, SkIntToScalar(size.height()));
-  window_mask->close();
-}
-
-void OpaqueNonClientView::EnableClose(bool enable) {
-  close_button_->SetEnabled(enable);
-}
-
-void OpaqueNonClientView::ResetWindowControls() {
-  restore_button_->SetState(views::Button::BS_NORMAL);
-  minimize_button_->SetState(views::Button::BS_NORMAL);
-  maximize_button_->SetState(views::Button::BS_NORMAL);
-  // The close button isn't affected by this constraint.
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OpaqueNonClientView, views::View overrides:
-
-void OpaqueNonClientView::Paint(ChromeCanvas* canvas) {
-  if (browser_view_->IsFullscreen())
-    return;  // Nothing is visible, so don't bother to paint.
-
-  if (frame_->IsMaximized())
-    PaintMaximizedFrameBorder(canvas);
-  else
-    PaintRestoredFrameBorder(canvas);
-  PaintDistributorLogo(canvas);
-  PaintTitleBar(canvas);
-  PaintToolbarBackground(canvas);
-  PaintOTRAvatar(canvas);
-  if (!frame_->IsMaximized())
-    PaintRestoredClientEdge(canvas);
-}
-
-void OpaqueNonClientView::Layout() {
-  LayoutWindowControls();
-  LayoutDistributorLogo();
-  LayoutTitleBar();
-  LayoutOTRAvatar();
-  LayoutClientView();
-}
-
-views::View* OpaqueNonClientView::GetViewForPoint(const gfx::Point& point,
-                                                  bool can_create_floating) {
-  // We override this function because the ClientView can overlap the non -
-  // client view, making it impossible to click on the window controls. We need
-  // to ensure the window controls are checked _first_.
-  views::View* views[] =
-      { close_button_, restore_button_, maximize_button_, minimize_button_ };
-  for (int i = 0; i < arraysize(views); ++i) {
-    if (!views[i]->IsVisible())
-      continue;
-    // Apply mirroring transformation on view bounds for RTL chrome.
-    if (views[i]->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(point))
-      return views[i];
-  }
-  return View::GetViewForPoint(point, can_create_floating);
-}
-
-void OpaqueNonClientView::ViewHierarchyChanged(bool is_add,
-                                               views::View* parent,
-                                               views::View* child) {
-  if (is_add && child == this) {
-    DCHECK(GetWidget());
-    DCHECK(frame_->client_view()->GetParent() != this);
-    AddChildView(frame_->client_view());
-
-    // The Accessibility glue looks for the product name on these two views to
-    // determine if this is in fact a Chrome window.
-    GetRootView()->SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
-    SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
-  }
-}
-
-bool OpaqueNonClientView::GetAccessibleRole(VARIANT* role) {
-  DCHECK(role);
-  // We aren't actually the client area of the window, but we act like it as
-  // far as MSAA and the UI tests are concerned.
-  role->vt = VT_I4;
-  role->lVal = ROLE_SYSTEM_CLIENT;
-  return true;
-}
-
-bool OpaqueNonClientView::GetAccessibleName(std::wstring* name) {
-  if (!accessible_name_.empty()) {
-    *name = accessible_name_;
-    return true;
-  }
-  return false;
-}
-
-void OpaqueNonClientView::SetAccessibleName(const std::wstring& name) {
-  accessible_name_ = name;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OpaqueNonClientView, views::BaseButton::ButtonListener implementation:
-
-void OpaqueNonClientView::ButtonPressed(views::BaseButton* sender) {
-  if (sender == minimize_button_)
-    frame_->ExecuteSystemMenuCommand(SC_MINIMIZE);
-  else if (sender == maximize_button_)
-    frame_->ExecuteSystemMenuCommand(SC_MAXIMIZE);
-  else if (sender == restore_button_)
-    frame_->ExecuteSystemMenuCommand(SC_RESTORE);
-  else if (sender == close_button_)
-    frame_->ExecuteSystemMenuCommand(SC_CLOSE);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OpaqueNonClientView, TabIconView::TabContentsProvider implementation:
-
-bool OpaqueNonClientView::ShouldTabIconViewAnimate() const {
-  // This function is queried during the creation of the window as the
-  // TabIconView we host is initialized, so we need to NULL check the selected
-  // TabContents because in this condition there is not yet a selected tab.
-  TabContents* current_tab = browser_view_->GetSelectedTabContents();
-  return current_tab ? current_tab->is_loading() : false;
-}
-
-SkBitmap OpaqueNonClientView::GetFavIconForTabIconView() {
-  return frame_->window_delegate()->GetWindowIcon();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// OpaqueNonClientView, private:
-
-int OpaqueNonClientView::FrameBorderThickness() const {
-  if (browser_view_->IsFullscreen())
-    return 0;
-  return frame_->IsMaximized() ?
-      GetSystemMetrics(SM_CXSIZEFRAME) : kFrameBorderThickness;
-}
-
-int OpaqueNonClientView::TopResizeHeight() const {
-  return FrameBorderThickness() - kTopResizeAdjust;
-}
-
-int OpaqueNonClientView::NonClientBorderThickness() const {
-  // When we fill the screen, we don't show a client edge.
-  return FrameBorderThickness() +
-      (browser_view_->CanCurrentlyResize() ? kClientEdgeThickness : 0);
-}
-
-int OpaqueNonClientView::NonClientTopBorderHeight() const {
-  if (frame_->window_delegate()->ShouldShowWindowTitle()) {
-    int title_top_spacing, title_thickness;
-    return TitleCoordinates(&title_top_spacing, &title_thickness);
-  }
-
-  return FrameBorderThickness() + (browser_view_->CanCurrentlyResize() ?
-      kNonClientRestoredExtraThickness : 0);
-}
-
-int OpaqueNonClientView::UnavailablePixelsAtBottomOfNonClientHeight() const {
-  // Tricky: When a toolbar is edging the titlebar, it not only draws its own
-  // shadow and client edge, but an extra, light "shadow" pixel as well, which
-  // is treated as available space.  Thus the nonclient area actually _fails_ to
-  // include some available pixels, leading to a negative number here.
-  if (browser_view_->IsToolbarVisible())
-    return -kFrameShadowThickness;
-
-  return kFrameShadowThickness +
-      (frame_->IsMaximized() ? 0 : kClientEdgeThickness);
-}
-
-int OpaqueNonClientView::TitleCoordinates(int* title_top_spacing,
-                                          int* title_thickness) const {
-  int frame_thickness = FrameBorderThickness();
-  int min_titlebar_height = kTitlebarMinimumHeight + frame_thickness;
-  *title_top_spacing = frame_thickness + kTitleTopSpacing;
-  // The bottom spacing should be the same apparent height as the top spacing.
-  // Because the actual top spacing height varies based on the system border
-  // thickness, we calculate this based on the restored top spacing and then
-  // adjust for maximized mode.  We also don't include the frame shadow here,
-  // since while it's part of the bottom spacing it will be added in at the end
-  // as necessary (when a toolbar is present, the "shadow" is actually drawn by
-  // the toolbar).
-  int title_bottom_spacing =
-      kFrameBorderThickness + kTitleTopSpacing - kFrameShadowThickness;
-  if (frame_->IsMaximized()) {
-    // When we maximize, the top border appears to be chopped off; shift the
-    // title down to stay centered within the remaining space.
-    int title_adjust = (kFrameBorderThickness / 2);
-    *title_top_spacing += title_adjust;
-    title_bottom_spacing -= title_adjust;
-  }
-  *title_thickness = std::max(title_font_.height(),
-      min_titlebar_height - *title_top_spacing - title_bottom_spacing);
-  return *title_top_spacing + *title_thickness + title_bottom_spacing +
-      UnavailablePixelsAtBottomOfNonClientHeight();
-}
-
-void OpaqueNonClientView::PaintRestoredFrameBorder(ChromeCanvas* canvas) {
-  SkBitmap* top_left_corner = resources()->GetPartBitmap(FRAME_TOP_LEFT_CORNER);
-  SkBitmap* top_right_corner =
-      resources()->GetPartBitmap(FRAME_TOP_RIGHT_CORNER);
-  SkBitmap* top_edge = resources()->GetPartBitmap(FRAME_TOP_EDGE);
-  SkBitmap* right_edge = resources()->GetPartBitmap(FRAME_RIGHT_EDGE);
-  SkBitmap* left_edge = resources()->GetPartBitmap(FRAME_LEFT_EDGE);
-  SkBitmap* bottom_left_corner =
-      resources()->GetPartBitmap(FRAME_BOTTOM_LEFT_CORNER);
-  SkBitmap* bottom_right_corner =
-    resources()->GetPartBitmap(FRAME_BOTTOM_RIGHT_CORNER);
-  SkBitmap* bottom_edge = resources()->GetPartBitmap(FRAME_BOTTOM_EDGE);
-
-  // 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);
-  // Note: When we don't have a toolbar, we need to draw some kind of bottom
-  // edge here.  Because the App Window graphics we use for this have an
-  // attached client edge and their sizing algorithm is a little involved, we do
-  // all this in PaintRestoredClientEdge().
-
-  // 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 OpaqueNonClientView::PaintMaximizedFrameBorder(ChromeCanvas* canvas) {
-  SkBitmap* top_edge = resources()->GetPartBitmap(FRAME_TOP_EDGE);
-  canvas->TileImageInt(*top_edge, 0, FrameBorderThickness(), width(),
-                       top_edge->height());
-
-  if (!browser_view_->IsToolbarVisible()) {
-    // There's no toolbar to edge the frame border, so we need to draw a bottom
-    // edge.  The graphic we use for this has a built in client edge, so we clip
-    // it off the bottom.
-    SkBitmap* top_center =
-        resources()->GetPartBitmap(FRAME_NO_TOOLBAR_TOP_CENTER);
-    int edge_height = top_center->height() - kClientEdgeThickness;
-    canvas->TileImageInt(*top_center, 0,
-        frame_->client_view()->y() - edge_height, width(), edge_height);
-  }
-}
-
-void OpaqueNonClientView::PaintDistributorLogo(ChromeCanvas* canvas) {
-  // The distributor logo is only painted when the frame is not maximized and
-  // when we actually have a logo.
-  if (!frame_->IsMaximized() && distributor_logo_) {
-    canvas->DrawBitmapInt(*distributor_logo_,
-        MirroredLeftPointForRect(logo_bounds_), logo_bounds_.y());
-  }
-}
-
-void OpaqueNonClientView::PaintTitleBar(ChromeCanvas* canvas) {
-  // The window icon is painted by the TabIconView.
-  views::WindowDelegate* d = frame_->window_delegate();
-  if (d->ShouldShowWindowTitle()) {
-    canvas->DrawStringInt(d->GetWindowTitle(), title_font_, SK_ColorWHITE,
-        MirroredLeftPointForRect(title_bounds_), title_bounds_.y(),
-        title_bounds_.width(), title_bounds_.height());
-    /* TODO(pkasting):  If this window is active, we should also draw a drop
-     * shadow on the title.  This is tricky, because we don't want to hardcode a
-     * shadow color (since we want to work with various themes), but we can't
-     * alpha-blend either (since the Windows text APIs don't really do this).
-     * So we'd need to sample the background color at the right location and
-     * synthesize a good shadow color. */
-  }
-}
-
-void OpaqueNonClientView::PaintToolbarBackground(ChromeCanvas* canvas) {
-  if (!browser_view_->IsToolbarVisible())
-    return;
-
-  gfx::Rect toolbar_bounds(browser_view_->GetToolbarBounds());
-  gfx::Point toolbar_origin(toolbar_bounds.origin());
-  View::ConvertPointToView(frame_->client_view(), this, &toolbar_origin);
-  toolbar_bounds.set_origin(toolbar_origin);
-
-  SkBitmap* toolbar_left =
-      resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT);
-  canvas->DrawBitmapInt(*toolbar_left,
-                        toolbar_bounds.x() - toolbar_left->width(),
-                        toolbar_bounds.y());
-
-  // Gross hack: We split the toolbar image into two pieces, since sometimes
-  // (popup mode) the toolbar isn't tall enough to show the whole image.  The
-  // split happens between the top shadow section and the bottom gradient
-  // section so that we never break the gradient.
-  int split_point = kFrameShadowThickness * 2;
-  SkBitmap* toolbar_center =
-      resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP);
-  canvas->TileImageInt(*toolbar_center, 0, 0, toolbar_bounds.x(),
-      toolbar_bounds.y(), toolbar_bounds.width(), split_point);
-  canvas->TileImageInt(*toolbar_center, 0,
-      toolbar_center->height() - toolbar_bounds.height() + split_point,
-      toolbar_bounds.x(), toolbar_bounds.y() + split_point,
-      toolbar_bounds.width(), toolbar_bounds.height() - split_point);
-
-  canvas->DrawBitmapInt(
-      *resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_RIGHT),
-      toolbar_bounds.right(), toolbar_bounds.y());
-}
-
-void OpaqueNonClientView::PaintOTRAvatar(ChromeCanvas* canvas) {
-  if (!browser_view_->ShouldShowOffTheRecordAvatar())
-    return;
-
-  SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon();
-  canvas->DrawBitmapInt(otr_avatar_icon, 0,
-      (otr_avatar_icon.height() - otr_avatar_bounds_.height()) / 2,
-      otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), 
-      MirroredLeftPointForRect(otr_avatar_bounds_), otr_avatar_bounds_.y(),
-      otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), false);
-}
-
-void OpaqueNonClientView::PaintRestoredClientEdge(ChromeCanvas* canvas) {
-  int client_area_top = frame_->client_view()->y();
-
-  gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
-  if (browser_view_->IsToolbarVisible()) {
-    // The client edges start below the toolbar upper corner images regardless
-    // of how tall the toolbar itself is.
-    client_area_top += browser_view_->GetToolbarBounds().y() +
-        resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT)->height();
-  } else {
-    // The toolbar isn't going to draw a client edge for us, so draw one
-    // ourselves.
-    // This next calculation is necessary because the top center bitmap is
-    // shorter than the top left and right bitmaps.  We need their top edges to
-    // line up, and we need the left and right edges to start below the corners'
-    // bottoms.
-    SkBitmap* top_center =
-        resources()->GetPartBitmap(FRAME_NO_TOOLBAR_TOP_CENTER);
-    SkBitmap* top_left = resources()->GetPartBitmap(FRAME_NO_TOOLBAR_TOP_LEFT);
-    int top_edge_y = client_area_top - top_center->height();
-    client_area_top = top_edge_y + top_left->height();
-    canvas->DrawBitmapInt(*top_left, client_area_bounds.x() - top_left->width(),
-                          top_edge_y);
-    canvas->TileImageInt(*top_center, client_area_bounds.x(), top_edge_y,
-                         client_area_bounds.width(), top_center->height());
-    canvas->DrawBitmapInt(
-        *resources()->GetPartBitmap(FRAME_NO_TOOLBAR_TOP_RIGHT),
-        client_area_bounds.right(), top_edge_y);
-  }
-
-  int client_area_bottom =
-      std::max(client_area_top, height() - NonClientBorderThickness());
-  int client_area_height = client_area_bottom - client_area_top;
-  SkBitmap* right = resources()->GetPartBitmap(FRAME_CLIENT_EDGE_RIGHT);
-  canvas->TileImageInt(*right, client_area_bounds.right(), client_area_top,
-                       right->width(), client_area_height);
-
-  canvas->DrawBitmapInt(
-      *resources()->GetPartBitmap(FRAME_CLIENT_EDGE_BOTTOM_RIGHT),
-      client_area_bounds.right(), client_area_bottom);
-
-  SkBitmap* bottom = resources()->GetPartBitmap(FRAME_CLIENT_EDGE_BOTTOM);
-  canvas->TileImageInt(*bottom, client_area_bounds.x(),
-      client_area_bottom, client_area_bounds.width(),
-      bottom->height());
-
-  SkBitmap* bottom_left =
-      resources()->GetPartBitmap(FRAME_CLIENT_EDGE_BOTTOM_LEFT);
-  canvas->DrawBitmapInt(*bottom_left,
-      client_area_bounds.x() - bottom_left->width(), client_area_bottom);
-
-  SkBitmap* left = resources()->GetPartBitmap(FRAME_CLIENT_EDGE_LEFT);
-  canvas->TileImageInt(*left, client_area_bounds.x() - left->width(),
-      client_area_top, left->width(), client_area_height);
-}
-
-void OpaqueNonClientView::LayoutWindowControls() {
-  close_button_->SetImageAlignment(views::Button::ALIGN_LEFT,
-                                   views::Button::ALIGN_BOTTOM);
-  // 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.
-  bool is_maximized = frame_->IsMaximized();
-  int frame_thickness = FrameBorderThickness();
-  int caption_y = is_maximized ? frame_thickness : kCaptionTopSpacing;
-  int top_extra_height = is_maximized ? kCaptionTopSpacing : 0;
-  // 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;
-  int right_spacing = is_maximized ?
-      (GetSystemMetrics(SM_CXSIZEFRAME) + right_extra_width) : frame_thickness;
-  gfx::Size close_button_size = close_button_->GetPreferredSize();
-  close_button_->SetBounds(width() - close_button_size.width() - right_spacing,
-                           caption_y,
-                           close_button_size.width() + right_extra_width,
-                           close_button_size.height() + top_extra_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::Button* invisible_button = is_restored ?
-      restore_button_ : maximize_button_;
-  invisible_button->SetVisible(false);
-
-  views::Button* visible_button = is_restored ?
-      maximize_button_ : restore_button_;
-  visible_button->SetVisible(true);
-  visible_button->SetImageAlignment(views::Button::ALIGN_LEFT,
-                                    views::Button::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() + top_extra_height);
-
-  minimize_button_->SetVisible(true);
-  minimize_button_->SetImageAlignment(views::Button::ALIGN_LEFT,
-                                      views::Button::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() + top_extra_height);
-}
-
-void OpaqueNonClientView::LayoutDistributorLogo() {
-  // Always lay out the logo, even when it's not present, so we can lay out the
-  // window title based on its position.
-  if (distributor_logo_) {
-    logo_bounds_.SetRect(minimize_button_->x() - distributor_logo_->width() -
-        kLogoCaptionSpacing, TopResizeHeight(), distributor_logo_->width(),
-        distributor_logo_->height());
-  } else {
-    logo_bounds_.SetRect(minimize_button_->x(), TopResizeHeight(), 0, 0);
-  }
-}
-
-void OpaqueNonClientView::LayoutTitleBar() {
-  // Always lay out the icon, even when it's not present, so we can lay out the
-  // window title based on its position.
-  int frame_thickness = FrameBorderThickness();
-  int icon_x = frame_thickness + kIconLeftSpacing;
-
-  // The usable height of the titlebar area is the total height minus the top
-  // resize border and any edge area we draw at its bottom.
-  int title_top_spacing, title_thickness;
-  int top_height = TitleCoordinates(&title_top_spacing, &title_thickness);
-  int available_height = top_height - frame_thickness -
-      UnavailablePixelsAtBottomOfNonClientHeight();
-
-  // The icon takes up a constant fraction of the available height, down to a
-  // minimum size, and is always an even number of pixels on a side (presumably
-  // to make scaled icons look better).  It's centered within the usable height.
-  int icon_size = std::max((available_height * kIconHeightFractionNumerator /
-      kIconHeightFractionDenominator) / 2 * 2, kIconMinimumSize);
-  int icon_y = ((available_height - icon_size) / 2) + frame_thickness;
-
-  // Hack: 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 we come up to compensate.
-  if (!frame_->IsMaximized())
-    icon_y -= kIconRestoredAdjust;
-
-  views::WindowDelegate* d = frame_->window_delegate();
-  if (!d->ShouldShowWindowIcon())
-    icon_size = 0;
-  if (window_icon_)
-    window_icon_->SetBounds(icon_x, icon_y, icon_size, icon_size);
-
-  // Size the title, if visible.
-  if (d->ShouldShowWindowTitle()) {
-    int title_x = icon_x + icon_size +
-        (d->ShouldShowWindowIcon() ? kIconTitleSpacing : 0);
-    title_bounds_.SetRect(title_x,
-        title_top_spacing + ((title_thickness - title_font_.height()) / 2),
-        std::max(0, logo_bounds_.x() - kTitleLogoSpacing - title_x),
-        title_font_.height());
-  }
-}
-
-void OpaqueNonClientView::LayoutOTRAvatar() {
-  SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon();
-  int top_height = NonClientTopBorderHeight();
-  int tabstrip_height, otr_height;
-  if (browser_view_->IsTabStripVisible()) {
-    tabstrip_height = browser_view_->GetTabStripHeight() - kOTRBottomSpacing;
-    otr_height = frame_->IsMaximized() ?
-        (tabstrip_height - kOTRMaximizedTopSpacing) :
-        otr_avatar_icon.height();
-  } else {
-    tabstrip_height = otr_height = 0;
-  }
-  otr_avatar_bounds_.SetRect(NonClientBorderThickness() + kOTRSideSpacing,
-                             top_height + tabstrip_height - otr_height,
-                             otr_avatar_icon.width(), otr_height);
-}
-
-void OpaqueNonClientView::LayoutClientView() {
-  frame_->client_view()->SetBounds(CalculateClientAreaBounds(width(),
-                                                             height()));
-}
-
-// static
-void OpaqueNonClientView::InitClass() {
-  static bool initialized = false;
-  if (!initialized) {
-    active_resources_ = new ActiveWindowResources;
-    inactive_resources_ = new InactiveWindowResources;
-
-#if defined(GOOGLE_CHROME_BUILD)
-    distributor_logo_ = ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_DISTRIBUTOR_LOGO_LIGHT);
-#endif
-
-    initialized = true;
-  }
-}
-
-// static
-void OpaqueNonClientView::InitAppWindowResources() {
-  static bool initialized = false;
-  if (!initialized) {
-    title_font_ = win_util::GetWindowTitleFont();
-    initialized = true;
-  }
-}