Introduce new WebApp header style for hosted apps and fizzy apps on ash.

ash/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/frame/default_header_painter.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/header_painter_util.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 56 matching lines @@
 }  // namespace
 
 namespace ash {
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, public:
 
 DefaultHeaderPainter::DefaultHeaderPainter()
     : frame_(NULL),
       view_(NULL),
-      window_icon_(NULL),
-      window_icon_size_(HeaderPainterUtil::GetDefaultIconSize()),
+      left_header_view_(NULL),
+      left_header_view_size_(0),
+      left_header_view_offset_(0),
       caption_button_container_(NULL),
       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,
-    views::View* window_icon,
     FrameCaptionButtonContainerView* caption_button_container) {
   DCHECK(frame);
   DCHECK(header_view);
-  // window_icon may be NULL.
   DCHECK(caption_button_container);
   frame_ = frame;
   view_ = header_view;
-  window_icon_ = window_icon;
   caption_button_container_ = caption_button_container;
 
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_MINIMIZE,
       IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE,
       IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE_I,
       IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
       IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
@@ skipping 92 matching lines @@
   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());
 
-  if (window_icon_) {
-    // Vertically center the window icon with respect to the caption button
-    // container.
-    // Floor when computing the center of |caption_button_container_|.
-    int icon_offset_y =
-        caption_button_container_->height() / 2 - window_icon_size_ / 2;
-    window_icon_->SetBounds(HeaderPainterUtil::GetIconXOffset(), icon_offset_y,
-                            window_icon_size_, window_icon_size_);
-  }
+  LayoutLeftHeaderView();
 
   // The header/content separator line overlays the caption buttons.
   SetHeaderHeightForPainting(caption_button_container_->height());
 }
 
 int DefaultHeaderPainter::GetHeaderHeightForPainting() const {
   return height_;
 }
 
 void DefaultHeaderPainter::SetHeaderHeightForPainting(int height) {
   height_ = height;
 }
 
 void DefaultHeaderPainter::SchedulePaintForTitle() {
   view_->SchedulePaintInRect(GetTitleBounds());
 }
 
-void DefaultHeaderPainter::UpdateWindowIcon(views::View* window_icon,
-                                            int window_icon_size) {
-  window_icon_ = window_icon;
-  window_icon_size_ = window_icon_size;
+void DefaultHeaderPainter::UpdateHeaderOffset(int left_header_view_offset) {

[pkotwicz, 2014/08/13 01:19:47]

I think that |left_view_x_inset| is a better name. In particular,
|left_view_x_inset| does not apply to the header background which is also drawn
by this class
UpdateLeftViewXInset() is probably a better function name too

[benwells, 2014/08/13 08:09:28]

Done.

+  int old_offset = left_header_view_offset_;
+  left_header_view_offset_ = left_header_view_offset;
+  if (old_offset != left_header_view_offset_)
+    LayoutLeftHeaderView();
+}
+
+void DefaultHeaderPainter::UpdateLeftHeaderView(views::View* left_header_view,
+                                                int left_header_view_size) {
+  left_header_view_ = left_header_view;
+  left_header_view_size_ = left_header_view_size;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // gfx::AnimationDelegate overrides:
 
 void DefaultHeaderPainter::AnimationProgressed(
     const gfx::Animation* animation) {
   view_->SchedulePaintInRect(GetLocalBounds());
 }
 
@@ skipping 53 matching lines @@
   SkPaint paint;
   paint.setColor(color);
   // Draw the line as 1px thick regardless of scale factor.
   paint.setStrokeWidth(0);
 
   float thickness = 1 / canvas->image_scale();
   SkScalar y = SkIntToScalar(height_) - SkFloatToScalar(thickness);
   canvas->sk_canvas()->drawLine(0, y, SkIntToScalar(view_->width()), y, paint);
 }
 
+void DefaultHeaderPainter::LayoutLeftHeaderView() {
+  if (left_header_view_) {
+    // Vertically center the window icon with respect to the caption button
+    // container.
+    // Floor when computing the center of |caption_button_container_|.
+    int icon_offset_y = caption_button_container_->height() / 2 -
+                        left_header_view_->height() / 2;
+    int offset = left_header_view_offset_ ? left_header_view_offset_
+                                          : HeaderPainterUtil::GetIconXOffset();

[pkotwicz, 2014/08/13 01:19:47]

Nit: I think that checking equality to zero here would be clearer. But I could
be convinced otherwise.

[benwells, 2014/08/13 08:09:28]

Done.

+    left_header_view_->SetBounds(
+        offset, icon_offset_y, left_header_view_size_, left_header_view_size_);

[pkotwicz, 2014/08/13 01:19:47]

Can we use left_header_view_->GetPreferredSize() and get rid of the
|left_header_view_size_| member variable completely?

[benwells, 2014/08/13 08:09:28]

Seems so. The code sure is nicer! I hope it doesn't break panels or the custom
frame stuff, I'm not sure how to test that on a local build.

+  }
+}
+
 gfx::Rect DefaultHeaderPainter::GetLocalBounds() const {
   return gfx::Rect(view_->width(), height_);
 }
 
 gfx::Rect DefaultHeaderPainter::GetTitleBounds() const {
   return HeaderPainterUtil::GetTitleBounds(
-      window_icon_, caption_button_container_, GetTitleFontList());
+      left_header_view_, caption_button_container_, GetTitleFontList());
 }
 
 gfx::ImageSkia* DefaultHeaderPainter::GetActiveFrameImage() const {
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_AURA_WINDOW_HEADER_BASE);
 }
 
 gfx::ImageSkia* DefaultHeaderPainter::GetInactiveFrameImage() const {
   int frame_image_id = (frame_->IsMaximized() || frame_->IsFullscreen()) ?
       IDR_AURA_WINDOW_HEADER_BASE :
       IDR_AURA_WINDOW_HEADER_BASE_RESTORED_INACTIVE;
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       frame_image_id);
 }
 
 }  // namespace ash