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

chrome/browser/ui/views/frame/browser_header_painter_ash.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 "chrome/browser/ui/views/frame/browser_header_painter_ash.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/header_painter_util.h"
 #include "base/logging.h"  // DCHECK
 #include "chrome/browser/ui/browser.h"
@@ skipping 96 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserHeaderPainterAsh, public:
 
 BrowserHeaderPainterAsh::BrowserHeaderPainterAsh()
     : frame_(NULL),
       is_tabbed_(false),
       is_incognito_(false),
       view_(NULL),
       window_icon_(NULL),
+      window_icon_x_inset_(ash::HeaderPainterUtil::GetDefaultLeftViewXInset()),
       caption_button_container_(NULL),
       painted_height_(0),
       initial_paint_(true),
       mode_(MODE_INACTIVE),
       activation_animation_(new gfx::SlideAnimation(this)) {
 }
 
 BrowserHeaderPainterAsh::~BrowserHeaderPainterAsh() {
 }
 
@@ skipping 111 matching lines @@
       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.
-    int icon_size = ash::HeaderPainterUtil::GetDefaultIconSize();
-    int icon_offset_y = (caption_button_container_->height() - icon_size) / 2;
-    window_icon_->SetBounds(ash::HeaderPainterUtil::GetIconXOffset(),
-        icon_offset_y, icon_size, icon_size);
+    gfx::Size icon_size(window_icon_->GetPreferredSize());
+    int icon_offset_y = (caption_button_container_->height() -
+                         icon_size.height()) / 2;
+    window_icon_->SetBounds(window_icon_x_inset_,
+                            icon_offset_y,
+                            icon_size.width(),
+                            icon_size.height());
   }
 }
 
 int BrowserHeaderPainterAsh::GetHeaderHeightForPainting() const {
   return painted_height_;
 }
 
 void BrowserHeaderPainterAsh::SetHeaderHeightForPainting(int height) {
   painted_height_ = height;
 }
 
 void BrowserHeaderPainterAsh::SchedulePaintForTitle() {
   view_->SchedulePaintInRect(GetTitleBounds());
 }
 
+void BrowserHeaderPainterAsh::UpdateLeftViewXInset(int left_view_x_inset) {
+  window_icon_x_inset_ = left_view_x_inset;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // gfx::AnimationDelegate overrides:
 
 void BrowserHeaderPainterAsh::AnimationProgressed(
     const gfx::Animation* animation) {
   view_->SchedulePaintInRect(GetPaintedBounds());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserHeaderPainterAsh, private:
@@ skipping 151 matching lines @@
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetPaintedBounds() const {
   return gfx::Rect(view_->width(), painted_height_);
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetTitleBounds() const {
   return ash::HeaderPainterUtil::GetTitleBounds(window_icon_,
       caption_button_container_, BrowserFrame::GetTitleFontList());
 }