mash: improves browser frame decorations

ash/common/frame/default_header_painter.cc

 // Copyright 2014 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/default_header_painter.h"
 
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/common/frame/header_painter_util.h"
 #include "ash/resources/grit/ash_resources.h"
@@ skipping 59 matching lines @@
   return *title_font_list;
 }
 
 }  // namespace
 
 namespace ash {
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, public:
 
-DefaultHeaderPainter::DefaultHeaderPainter()
-    : frame_(NULL),
-      view_(NULL),
-      left_header_view_(NULL),
+DefaultHeaderPainter::DefaultHeaderPainter(mojom::WindowStyle window_style)
+    : window_style_(window_style),
+      frame_(nullptr),
+      view_(nullptr),
+      left_header_view_(nullptr),
       active_frame_color_(kDefaultFrameColor),
       inactive_frame_color_(kDefaultFrameColor),
-      caption_button_container_(NULL),
+      caption_button_container_(nullptr),
       painted_height_(0),
       mode_(MODE_INACTIVE),
       initial_paint_(true),
       activation_animation_(new gfx::SlideAnimation(this)) {}
 
 DefaultHeaderPainter::~DefaultHeaderPainter() {}
 
 void DefaultHeaderPainter::Init(
     views::Widget* frame,
     views::View* header_view,
@@ skipping 52 matching lines @@
       mode_ == MODE_INACTIVE && !UsesCustomFrameColors()) {
     PaintHighlightForInactiveRestoredWindow(canvas);
   }
   if (frame_->widget_delegate()->ShouldShowWindowTitle())
     PaintTitleBar(canvas);
   if (!UsesCustomFrameColors())
     PaintHeaderContentSeparator(canvas);
 }
 
 void DefaultHeaderPainter::LayoutHeader() {
+  // TODO(sky): this needs to reset images as well.
+  if (window_style_ == mojom::WindowStyle::BROWSER) {
+    const bool use_maximized_size =
+        frame_->IsMaximized() || frame_->IsFullscreen();
+    const gfx::Size button_size(GetAshLayoutSize(
+        use_maximized_size ? AshLayoutSize::BROWSER_MAXIMIZED_CAPTION_BUTTON
+                           : AshLayoutSize::BROWSER_RESTORED_CAPTION_BUTTON));
+    caption_button_container_->SetButtonSize(button_size);
+  }
+
   caption_button_container_->SetUseLightImages(ShouldUseLightImages());
   UpdateSizeButtonImages();
   caption_button_container_->Layout();
 
   gfx::Size caption_button_container_size =
       caption_button_container_->GetPreferredSize();
   caption_button_container_->SetBounds(
       view_->width() - caption_button_container_size.width(), 0,
       caption_button_container_size.width(),
       caption_button_container_size.height());
@@ skipping 144 matching lines @@
   return HeaderPainterUtil::GetTitleBounds(
       left_header_view_, caption_button_container_, GetTitleFontList());
 }
 
 bool DefaultHeaderPainter::UsesCustomFrameColors() const {
   return active_frame_color_ != kDefaultFrameColor ||
          inactive_frame_color_ != kDefaultFrameColor;
 }
 
 }  // namespace ash