mash: improves browser frame decorations

chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc

 // Copyright 2015 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_mus.h"
 
 #include <algorithm>
 
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_frame_mus.h"
 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/layout.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/common/ash_layout_constants.h"
+#endif
+
 #if !defined(OS_CHROMEOS)
 #define FRAME_AVATAR_BUTTON
 #endif
 
 namespace {
 
 #if defined(FRAME_AVATAR_BUTTON)
 // Space between the new avatar button and the minimize button.
 const int kAvatarButtonOffset = 5;
 #endif
 // Space between right edge of tabstrip and maximize button.
 const int kTabstripRightSpacing = 10;
-// Height of the shadow of the content area, at the top of the toolbar.
-const int kContentShadowHeight = 1;
-// Space between top of window and top of tabstrip for tall headers, such as
-// for restored windows, apps, etc.
-const int kTabstripTopSpacingTall = 4;
-// Space between top of window and top of tabstrip for short headers, such as
-// for maximized windows, pop-ups, etc.
-const int kTabstripTopSpacingShort = 0;
 // 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;
 
 #if defined(FRAME_AVATAR_BUTTON)
 // Combines View::ConvertPointToTarget() and View::HitTest() for a given
 // |point|. Converts |point| from |src| to |dst| and hit tests it against |dst|.
 bool ConvertedHitTest(views::View* src,
                       views::View* dst,
@@ skipping 57 matching lines @@
   tab_strip_->AddObserver(this);
 }
 
 gfx::Rect BrowserNonClientFrameViewMus::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   if (!tabstrip)
     return gfx::Rect();
 
   int left_inset = GetTabStripLeftInset();
   int right_inset = GetTabStripRightInset();
-  return gfx::Rect(left_inset, GetTopInset(false),
-                   std::max(0, width() - left_inset - right_inset),
-                   tabstrip->GetPreferredSize().height());
+  const gfx::Rect bounds(left_inset, GetTopInset(false),
+                         std::max(0, width() - left_inset - right_inset),
+                         tabstrip->GetPreferredSize().height());
+  return bounds;
 }
 
 int BrowserNonClientFrameViewMus::GetTopInset(bool restored) const {
   if (!ShouldPaint()) {
     // When immersive fullscreen unrevealed, tabstrip is offscreen with normal
     // tapstrip bounds, the top inset should reach this topmost edge.
     const ImmersiveModeController* const immersive_controller =
         browser_view()->immersive_mode_controller();
     if (immersive_controller->IsEnabled() &&
         !immersive_controller->IsRevealed()) {
       return (-1) * browser_view()->GetTabStripHeight();
     }
     return 0;
   }
 
-  if (browser_view()->IsTabStripVisible()) {
-    return ((frame()->IsMaximized() || frame()->IsFullscreen()) && !restored)
-               ? kTabstripTopSpacingShort
-               : kTabstripTopSpacingTall;
-  }
+  const int header_height = GetHeaderHeight();
 
-  int caption_buttons_bottom = frame_values().normal_insets.top();
+  if (browser_view()->IsTabStripVisible())
+    return header_height - browser_view()->GetTabStripHeight();
 
-  // The toolbar partially overlaps the caption buttons.
-  if (browser_view()->IsToolbarVisible())
-    return caption_buttons_bottom - kContentShadowHeight;
-
-  return caption_buttons_bottom + kClientEdgeThickness;
+  return header_height;
 }
 
 int BrowserNonClientFrameViewMus::GetThemeBackgroundXInset() const {
   return 5;
 }
 
 void BrowserNonClientFrameViewMus::UpdateThrobber(bool running) {
   if (window_icon_)
     window_icon_->Update();
 }
@@ skipping 26 matching lines @@
         tab_strip_bounds.set_y(tab_strip_bounds.y() + top_container_offset);
         tab_strip_bounds.Intersect(gfx::Rect(size()));
       }
       additional_client_area.push_back(tab_strip_bounds);
     }
   }
   aura::WindowTreeHostMus* window_tree_host_mus =
       static_cast<aura::WindowTreeHostMus*>(
           GetWidget()->GetNativeWindow()->GetHost());
   if (show_frame_decorations) {
-    window_tree_host_mus->SetClientArea(
-        views::WindowManagerFrameValues::instance().normal_insets,
-        additional_client_area);
+    const int header_height = GetHeaderHeight();
+    gfx::Insets client_area_insets =
+        views::WindowManagerFrameValues::instance().normal_insets;
+    client_area_insets.Set(header_height, client_area_insets.left(),
+                           client_area_insets.bottom(),
+                           client_area_insets.right());
+    window_tree_host_mus->SetClientArea(client_area_insets,
+                                        additional_client_area);
     views::Widget* reveal_widget = immersive_mode_controller->GetRevealWidget();
     if (reveal_widget) {
       // In immersive mode the reveal widget needs the same client area as
       // the Browser widget. This way mus targets the window manager (ash) for
       // clicks in the frame decoration.
       static_cast<aura::WindowTreeHostMus*>(
           reveal_widget->GetNativeWindow()->GetHost())
-          ->SetClientArea(
-              views::WindowManagerFrameValues::instance().normal_insets,
-              additional_client_area);
+          ->SetClientArea(client_area_insets, additional_client_area);
     }
   } else {
     window_tree_host_mus->SetClientArea(gfx::Insets(), additional_client_area);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::NonClientFrameView:
 
 gfx::Rect BrowserNonClientFrameViewMus::GetBoundsForClientView() const {
@@ skipping 260 matching lines @@
 }
 
 void BrowserNonClientFrameViewMus::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle());
   const int bottom = frame_values().normal_insets.bottom();
   canvas->FillRect(
       gfx::Rect(0, bottom, width(), kClientEdgeThickness),
       GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR));
 }
+
+int BrowserNonClientFrameViewMus::GetHeaderHeight() const {
+#if defined(OS_CHROMEOS)
+  // TODO: move ash_layout_constants to ash/public/cpp.
+  const bool restored = !frame()->IsMaximized() && !frame()->IsFullscreen();
+  return GetAshLayoutSize(restored
+                              ? AshLayoutSize::BROWSER_RESTORED_CAPTION_BUTTON
+                              : AshLayoutSize::BROWSER_MAXIMIZED_CAPTION_BUTTON)
+      .height();
+#else
+  return views::WindowManagerFrameValues::instance().normal_insets.top();
+#endif
+}