Ash: Extend tabs to top of window for maximized windows

ash/wm/frame_painter.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/frame_painter.h"
 
 #include "base/logging.h"  // DCHECK
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
-// Size of border along top edge, used for resize handle computations.
-const int kTopThickness = 1;
 // TODO(jamescook): Border is specified to be a single pixel overlapping
 // the web content and may need to be built into the shadow layers instead.
 const int kBorderThickness = 0;
 // Ash windows do not have a traditional visible window frame.  Window content
 // extends to the edge of the window.  We consider a small region outside the
 // window bounds and an even smaller region overlapping the window to be the
 // "non-client" area and use it for resizing.
 const int kResizeOutsideBoundsSize = 6;
 const int kResizeInsideBoundsSize = 1;
 // In the window corners, the resize areas don't actually expand bigger, but the
@@ skipping 130 matching lines @@
                                    const gfx::Point& point) {
   gfx::Rect expanded_bounds = view->bounds();
   expanded_bounds.Inset(-kResizeOutsideBoundsSize, -kResizeOutsideBoundsSize);
   if (!expanded_bounds.Contains(point))
     return HTNOWHERE;
 
   // No avatar button.
 
   // Check the frame first, as we allow a small area overlapping the contents
   // to be used for resize handles.
-  bool can_resize = frame_->widget_delegate() ?
+  bool can_ever_resize = frame_->widget_delegate() ?
       frame_->widget_delegate()->CanResize() :
       false;
+  // Don't allow overlapping resize handles when the window is maximized, as it
+  // can't be resized in that state.
+  int resize_border = frame_->IsMaximized() ? 0 : kResizeInsideBoundsSize;
   int frame_component = view->GetHTComponentForFrame(point,
-                                                     kResizeInsideBoundsSize,
-                                                     kResizeInsideBoundsSize,
+                                                     resize_border,
+                                                     resize_border,
                                                      kResizeAreaCornerSize,
                                                      kResizeAreaCornerSize,
-                                                     can_resize);
+                                                     can_ever_resize);
   if (frame_component != HTNOWHERE)
     return frame_component;
 
   int client_component = frame_->client_view()->NonClientHitTest(point);
   if (client_component != HTNOWHERE)
     return client_component;
 
   // Then see if the point is within any of the window controls.
   if (close_button_->visible() &&
       close_button_->GetMirroredBounds().Contains(point))
@@ skipping 175 matching lines @@
                    theme_provider->GetBitmapNamed(pushed_bitmap_id));
 }
 
 int FramePainter::GetTitleOffsetX() const {
   return window_icon_ ?
       window_icon_->bounds().right() + kTitleIconOffsetX :
       kTitleNoIconOffsetX;
 }
 
 }  // namespace ash