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

chrome/browser/ui/views/frame/browser_header_painter_ash.cc

Index: chrome/browser/ui/views/frame/browser_header_painter_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
index be2dbc75e27497608f0689bf925628f852811823..418fd54eb0269cc91d4612209ef5621afb08688c 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -114,6 +114,7 @@ BrowserHeaderPainterAsh::BrowserHeaderPainterAsh()
       is_incognito_(false),
       view_(NULL),
       window_icon_(NULL),
+      left_view_x_inset_(ash::HeaderPainterUtil::GetDefaultLeftViewXInset()),
       caption_button_container_(NULL),
       painted_height_(0),
       initial_paint_(true),
@@ -245,10 +246,13 @@ void BrowserHeaderPainterAsh::LayoutHeader() {
   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(left_view_x_inset_,
+                            icon_offset_y,
+                            icon_size.width(),
+                            icon_size.height());
   }
 }
 
@@ -264,6 +268,10 @@ void BrowserHeaderPainterAsh::SchedulePaintForTitle() {
   view_->SchedulePaintInRect(GetTitleBounds());
 }
 
+void BrowserHeaderPainterAsh::UpdateLeftViewXInset(int left_view_x_inset) {
+  left_view_x_inset_ = left_view_x_inset;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // gfx::AnimationDelegate overrides: