Ash: Update tab strip for new image assets

chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.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 "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"  // Accessibility names
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 // The 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 kAvatarBottomSpacing = 2;
 // There are 2 px on each side of the avatar (between the frame border and
 // it on the left, and between it and the tabstrip on the right).
 const int kAvatarSideSpacing = 2;
 // Space between left edge of window and tabstrip.
 const int kTabstripLeftSpacing = 4;
 // Space between right edge of tabstrip and maximize button.
 const int kTabstripRightSpacing = 10;
 // Space between top of window and top of tabstrip for restored windows.
-const int kTabstripTopSpacingRestored = 10;
+const int kTabstripTopSpacingRestored = 8;
 // Space between top of window and top of tabstrip for maximized windows.
 // Place them flush to the top to make them clickable when the cursor is at
 // the screen edge.
 const int kTabstripTopSpacingMaximized = 0;
-// Height of the shadow of the tab images in the tab strip.
-const int kTabShadowHeight = 1;
+// Height of the shadow in the tab image, used to ensure clicks in the shadow
+// area still drag restored windows.  This keeps the clickable area large enough
+// to hit easily.
+const int kTabShadowHeight = 4;
+// Height of the shadow of the content area, at the top of the toolbar.
+const int kContentShadowHeight = 1;
+
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAura, public:
 
 BrowserNonClientFrameViewAura::BrowserNonClientFrameViewAura(
     BrowserFrame* frame, BrowserView* browser_view)
     : BrowserNonClientFrameView(frame, browser_view),
       maximize_button_(NULL),
       close_button_(NULL),
@@ skipping 68 matching lines @@
 }
 
 gfx::Rect BrowserNonClientFrameViewAura::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   int top_height = NonClientTopBorderHeight(false);
   return frame_painter_->GetWindowBoundsForClientBounds(top_height,
                                                         client_bounds);
 }
 
 int BrowserNonClientFrameViewAura::NonClientHitTest(const gfx::Point& point) {
-  return frame_painter_->NonClientHitTest(this, point);
+  int hit_test = frame_painter_->NonClientHitTest(this, point);
+  // When the window is restored we want a large click target above the tabs
+  // to drag the window, so redirect clicks in the tab's shadow to caption.
+  if (hit_test == HTCLIENT && !frame()->IsMaximized()) {
+    // Convert point to client coordinates.
+    gfx::Point client_point(point);
+    View::ConvertPointToView(this, frame()->client_view(), &client_point);
+    // Report hits in shadow at top of tabstrip as caption.
+    gfx::Rect tabstrip_bounds(browser_view()->tabstrip()->bounds());
+    if (client_point.y() < tabstrip_bounds.y() + kTabShadowHeight)
+      hit_test = HTCAPTION;
+  }
+  return hit_test;
 }
 
 void BrowserNonClientFrameViewAura::GetWindowMask(const gfx::Size& size,
                                                   gfx::Path* window_mask) {
   // Aura does not use window masks.
 }
 
 void BrowserNonClientFrameViewAura::ResetWindowControls() {
   maximize_button_->SetState(views::CustomButton::BS_NORMAL);
   // The close button isn't affected by this constraint.
@@ skipping 116 matching lines @@
 }
 
 void BrowserNonClientFrameViewAura::LayoutAvatar() {
   DCHECK(avatar_button());
   SkBitmap incognito_icon = browser_view()->GetOTRAvatarIcon();
 
   int avatar_bottom = GetHorizontalTabStripVerticalOffset(false) +
       browser_view()->GetTabStripHeight() - kAvatarBottomSpacing;
   int avatar_restored_y = avatar_bottom - incognito_icon.height();
   int avatar_y = frame()->IsMaximized() ?
-      NonClientTopBorderHeight(false) + kTabShadowHeight:
+      NonClientTopBorderHeight(false) + kContentShadowHeight:
       avatar_restored_y;
   gfx::Rect avatar_bounds(kAvatarSideSpacing,
                           avatar_y,
                           incognito_icon.width(),
                           avatar_bottom - avatar_y);
   avatar_button()->SetBoundsRect(avatar_bounds);
 }
 
 void BrowserNonClientFrameViewAura::PaintToolbarBackground(
     gfx::Canvas* canvas) {
@@ skipping 27 matching lines @@
   // source y position.  If you have to debug this code use an image editor
   // to paint a diagonal line through the toolbar image and ensure it lines up
   // across the tab and toolbar.
   bool restored = !frame()->IsMaximized();
   canvas->TileImageInt(
       *theme_toolbar,
       x, bottom_y - GetHorizontalTabStripVerticalOffset(restored),
       x, bottom_y,
       w, theme_toolbar->height());
 
+  // The content area line has a shadow that extends a couple of pixels above
+  // the toolbar bounds.
+  const int kContentShadowHeight = 2;
   SkBitmap* toolbar_center =
       tp->GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
   canvas->TileImageInt(*toolbar_center,
                        0, 0,
-                       x, y,
-                       w, split_point);
+                       x, y - kContentShadowHeight,
+                       w, split_point + kContentShadowHeight + 1);
 
   // Draw the content/toolbar separator.
   canvas->FillRect(gfx::Rect(x + kClientEdgeThickness,
                              toolbar_bounds.bottom() - kClientEdgeThickness,
                              w - (2 * kClientEdgeThickness),
                              kClientEdgeThickness),
       ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
 }
 
 const SkBitmap* BrowserNonClientFrameViewAura::GetThemeFrameBitmap() const {
@@ skipping 45 matching lines @@
 }
 
 SkBitmap* BrowserNonClientFrameViewAura::GetCustomBitmap(
     int bitmap_id,
     int fallback_bitmap_id) const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(bitmap_id))
     return tp->GetBitmapNamed(bitmap_id);
   return tp->GetBitmapNamed(fallback_bitmap_id);
 }