mash: improves browser frame decorations

ash/common/frame/custom_frame_view_ash.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/common/frame/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
@@ skipping 107 matching lines @@
 
 // View which takes up the entire widget and contains the HeaderView. HeaderView
 // is a child of OverlayView to avoid creating a larger texture than necessary
 // when painting the HeaderView to its own layer.
 class CustomFrameViewAsh::OverlayView : public views::View,
                                         public views::ViewTargeterDelegate {
  public:
   explicit OverlayView(HeaderView* header_view);
   ~OverlayView() override;
 
+  void SetHeaderHeight(base::Optional<int> height);
+
   // views::View:
   void Layout() override;
 
  private:
   // views::ViewTargeterDelegate:
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
   HeaderView* header_view_;
 
+  base::Optional<int> header_height_;

[James Cook, 2017/03/02 21:00:00]

This makes sense as Optional.

+
   DISALLOW_COPY_AND_ASSIGN(OverlayView);
 };
 
 CustomFrameViewAsh::OverlayView::OverlayView(HeaderView* header_view)
     : header_view_(header_view) {
   AddChildView(header_view);
   SetEventTargeter(
       std::unique_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 CustomFrameViewAsh::OverlayView::~OverlayView() {}
 
+void CustomFrameViewAsh::OverlayView::SetHeaderHeight(
+    base::Optional<int> height) {
+  if (header_height_ == height)
+    return;
+
+  header_height_ = height;
+  Layout();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::OverlayView, views::View overrides:
 
 void CustomFrameViewAsh::OverlayView::Layout() {
   // Layout |header_view_| because layout affects the result of
   // GetPreferredOnScreenHeight().
   header_view_->Layout();
 
-  int onscreen_height = header_view_->GetPreferredOnScreenHeight();
+  int onscreen_height = header_height_
+                            ? *header_height_
+                            : header_view_->GetPreferredOnScreenHeight();
   if (onscreen_height == 0) {
     header_view_->SetVisible(false);
   } else {
-    int height = header_view_->GetPreferredHeight();
+    const int height =
+        header_height_ ? *header_height_ : header_view_->GetPreferredHeight();
     header_view_->SetBounds(0, onscreen_height - height, width(), height);
     header_view_->SetVisible(true);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::OverlayView, views::ViewTargeterDelegate overrides:
 
 bool CustomFrameViewAsh::OverlayView::DoesIntersectRect(
     const views::View* target,
     const gfx::Rect& rect) const {
   CHECK_EQ(target, this);
   // Grab events in the header view. Return false for other events so that they
   // can be handled by the client view.
   return header_view_->HitTestRect(rect);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, public:
 
 // static
 const char CustomFrameViewAsh::kViewClassName[] = "CustomFrameViewAsh";
 
 CustomFrameViewAsh::CustomFrameViewAsh(
     views::Widget* frame,
     ImmersiveFullscreenControllerDelegate* immersive_delegate,
-    bool enable_immersive)
+    bool enable_immersive,
+    mojom::WindowStyle window_style)
     : frame_(frame),
-      header_view_(new HeaderView(frame)),
+      header_view_(new HeaderView(frame, window_style)),
+      overlay_view_(new OverlayView(header_view_)),
       immersive_delegate_(immersive_delegate ? immersive_delegate
                                              : header_view_) {
   WmWindow* frame_window = WmLookup::Get()->GetWindowForWidget(frame);
   frame_window->InstallResizeHandleWindowTargeter(nullptr);
   // |header_view_| is set as the non client view's overlay view so that it can
   // overlay the web contents in immersive fullscreen.
-  frame->non_client_view()->SetOverlayView(new OverlayView(header_view_));
+  frame->non_client_view()->SetOverlayView(overlay_view_);
   frame_window->SetColorProperty(WmWindowProperty::TOP_VIEW_COLOR,
                                  header_view_->GetInactiveFrameColor());
 
   // A delegate for a more complex way of fullscreening the window may already
   // be set. This is the case for packaged apps.
   wm::WindowState* window_state = frame_window->GetWindowState();
   if (!window_state->HasDelegate()) {
     window_state->SetDelegate(std::unique_ptr<wm::WindowStateDelegate>(
         new CustomFrameViewAshWindowStateDelegate(window_state, this,
                                                   enable_immersive)));
   }
 }
 
 CustomFrameViewAsh::~CustomFrameViewAsh() {}
 
 void CustomFrameViewAsh::InitImmersiveFullscreenControllerForView(
     ImmersiveFullscreenController* immersive_fullscreen_controller) {
   immersive_fullscreen_controller->Init(immersive_delegate_, frame_,
                                         header_view_);
 }
 
 void CustomFrameViewAsh::SetFrameColors(SkColor active_frame_color,
                                         SkColor inactive_frame_color) {
   header_view_->SetFrameColors(active_frame_color, inactive_frame_color);
   WmWindow* frame_window = WmLookup::Get()->GetWindowForWidget(frame_);
   frame_window->SetColorProperty(WmWindowProperty::TOP_VIEW_COLOR,
                                  header_view_->GetInactiveFrameColor());
 }
 
+void CustomFrameViewAsh::SetHeaderHeight(base::Optional<int> height) {
+  overlay_view_->SetHeaderHeight(height);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, views::NonClientFrameView overrides:
 
 gfx::Rect CustomFrameViewAsh::GetBoundsForClientView() const {
   gfx::Rect client_bounds = bounds();
   client_bounds.Inset(0, NonClientTopBorderHeight(), 0, 0);
   return client_bounds;
 }
 
 gfx::Rect CustomFrameViewAsh::GetWindowBoundsForClientBounds(
@@ skipping 116 matching lines @@
 FrameCaptionButtonContainerView*
 CustomFrameViewAsh::GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash