mash: improves browser frame decorations

ash/mus/non_client_frame_controller.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 "ash/mus/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 154 matching lines @@
   std::unique_ptr<DetachedTitleAreaRendererForInternal> title_area_renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenControllerDelegateMus);
 };
 
 class WmNativeWidgetAura : public views::NativeWidgetAura {
  public:
   WmNativeWidgetAura(views::internal::NativeWidgetDelegate* delegate,
                      aura::WindowManagerClient* window_manager_client,
                      bool remove_standard_frame,
-                     bool enable_immersive)
+                     bool enable_immersive,
+                     mojom::WindowStyle window_style)
       // The NativeWidget is mirroring the real Widget created in client code.
       // |is_parallel_widget_in_window_manager| is used to indicate this
       : views::NativeWidgetAura(
             delegate,
             true /* is_parallel_widget_in_window_manager */),
         remove_standard_frame_(remove_standard_frame),
         enable_immersive_(enable_immersive),
+        window_style_(window_style),
         window_manager_client_(window_manager_client) {}
   ~WmNativeWidgetAura() override {}
 
+  void SetHeaderHeight(int height) {
+    if (custom_frame_view_)
+      custom_frame_view_->SetHeaderHeight({height});
+  }
+
   // views::NativeWidgetAura:
   views::NonClientFrameView* CreateNonClientFrameView() override {
     move_event_handler_ = base::MakeUnique<MoveEventHandler>(
         window_manager_client_, GetNativeView());
     // TODO(sky): investigate why we have this. Seems this should be the same
     // as not specifying client area insets.
     if (remove_standard_frame_)
       return new EmptyDraggableNonClientFrameView();
     aura::Window* window = GetNativeView();
     if (window->GetProperty(aura::client::kWindowTypeKey) ==
         ui::mojom::WindowType::PANEL)
       return new PanelFrameView(GetWidget(), PanelFrameView::FRAME_ASH);
     immersive_delegate_ =
         base::MakeUnique<ImmersiveFullscreenControllerDelegateMus>(GetWidget(),
                                                                    window);
-    return new CustomFrameViewMus(GetWidget(), immersive_delegate_.get(),
-                                  enable_immersive_);
+
+    // See description for details on ownership.
+    custom_frame_view_ =
+        new CustomFrameViewMus(GetWidget(), immersive_delegate_.get(),
+                               enable_immersive_, window_style_);
+    return custom_frame_view_;
   }
 
  private:
   const bool remove_standard_frame_;
   const bool enable_immersive_;
+  const mojom::WindowStyle window_style_;
 
   std::unique_ptr<MoveEventHandler> move_event_handler_;
 
   aura::WindowManagerClient* window_manager_client_;
 
   std::unique_ptr<ImmersiveFullscreenControllerDelegateMus> immersive_delegate_;
 
+  // Not used for panels or if |remove_standard_frame_| is true. This is owned
+  // by the Widget's view hierarchy (e.g. it's a child of Widget's root View).
+  CustomFrameViewMus* custom_frame_view_ = nullptr;
+
   DISALLOW_COPY_AND_ASSIGN(WmNativeWidgetAura);
 };
 
 class ClientViewMus : public views::ClientView {
  public:
   ClientViewMus(views::Widget* widget,
                 views::View* contents_view,
                 NonClientFrameController* frame_controller)
       : views::ClientView(widget, contents_view),
         frame_controller_(frame_controller) {}
@@ skipping 43 matching lines @@
   // MusClient.
   views::Widget::InitParams params(
       static_cast<views::Widget::InitParams::Type>(window_type));
   DCHECK((parent && !context) || (!parent && context));
   params.parent = parent;
   params.context = context;
   // TODO: properly set |params.activatable|. Should key off whether underlying
   // (mus) window can have focus.
   params.delegate = this;
   params.bounds = bounds;
+  // The title area leaves notches in the corners, requring translucent windows.
+  params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   WmNativeWidgetAura* native_widget = new WmNativeWidgetAura(
       widget_, window_manager_client_, ShouldRemoveStandardFrame(*properties),
-      ShouldEnableImmersive(*properties));
+      ShouldEnableImmersive(*properties), GetWindowStyle(*properties));
   window_ = native_widget->GetNativeView();
   window_->SetProperty(aura::client::kTopLevelWindowInWM, true);
   window_->SetProperty(kNonClientFrameControllerKey, this);
   window_->SetProperty(kWidgetCreationTypeKey, WidgetCreationType::FOR_CLIENT);
   window_->AddObserver(this);
   params.native_widget = native_widget;
   aura::SetWindowType(window_, window_type);
   aura::PropertyConverter* property_converter =
       window_manager->property_converter();
   for (auto& property_pair : *properties) {
@@ skipping 16 matching lines @@
   aura::client::GetTransientWindowClient()->AddObserver(this);
 }
 
 // static
 NonClientFrameController* NonClientFrameController::Get(aura::Window* window) {
   return window->GetProperty(kNonClientFrameControllerKey);
 }
 
 // static
 gfx::Insets NonClientFrameController::GetPreferredClientAreaInsets() {
-  // TODO(sky): figure out a better way to get this rather than hard coding.
-  // This value comes from the header (see DefaultHeaderPainter::LayoutHeader,
-  // which uses the preferred height of the CaptionButtonContainer, which uses
-  // the height of the close button).
   return gfx::Insets(
       GetAshLayoutSize(AshLayoutSize::NON_BROWSER_CAPTION_BUTTON).height(), 0,
       0, 0);
 }
 
 // static
 int NonClientFrameController::GetMaxTitleBarButtonWidth() {
-  // TODO(sky): same comment as for GetPreferredClientAreaInsets().
   return GetAshLayoutSize(AshLayoutSize::NON_BROWSER_CAPTION_BUTTON).width() *
          3;
 }
 
 void NonClientFrameController::SetClientArea(
     const gfx::Insets& insets,
     const std::vector<gfx::Rect>& additional_client_areas) {
   client_area_insets_ = insets;
   additional_client_areas_ = additional_client_areas;
+  static_cast<WmNativeWidgetAura*>(widget_->native_widget())
+      ->SetHeaderHeight(insets.top());
 }
 
 NonClientFrameController::~NonClientFrameController() {
   aura::client::GetTransientWindowClient()->RemoveObserver(this);
   if (window_)
     window_->RemoveObserver(this);
 }
 
 base::string16 NonClientFrameController::GetWindowTitle() const {
   if (!window_ || !window_->GetProperty(aura::client::kTitleKey))
@@ skipping 85 matching lines @@
 void NonClientFrameController::OnWillRestackTransientChildAbove(
     aura::Window* parent,
     aura::Window* transient_child) {}
 
 void NonClientFrameController::OnDidRestackTransientChildAbove(
     aura::Window* parent,
     aura::Window* transient_child) {}
 
 }  // namespace mus
 }  // namespace ash