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

ash/frame/default_header_painter.h

Index: ash/frame/default_header_painter.h
diff --git a/ash/frame/default_header_painter.h b/ash/frame/default_header_painter.h
index 3a99f819c6186677f6c1abc7e863ab49689d49e3..ba1d9e882b20aad9c6a6a78c6d708068f814f03b 100644
--- a/ash/frame/default_header_painter.h
+++ b/ash/frame/default_header_painter.h
@@ -37,7 +37,6 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
   // DefaultHeaderPainter does not take ownership of any of the parameters.
   void Init(views::Widget* frame,
             views::View* header_view,
-            views::View* window_icon,
             FrameCaptionButtonContainerView* caption_button_container);
 
   // HeaderPainter overrides:
@@ -47,9 +46,10 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
   virtual int GetHeaderHeightForPainting() const OVERRIDE;
   virtual void SetHeaderHeightForPainting(int height) OVERRIDE;
   virtual void SchedulePaintForTitle() OVERRIDE;
+  virtual void UpdateLeftViewXInset(int left_view_x_inset) OVERRIDE;
 
-  // Sets the window icon for the header. Passing NULL removes the window icon.
-  void UpdateWindowIcon(views::View* window_icon, int icon_size);
+  // Sets the left header view for the header. Passing NULL removes the view.
+  void UpdateLeftHeaderView(views::View* left_header_view);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment);
@@ -67,6 +67,9 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
   // Paints the header/content separator.
   void PaintHeaderContentSeparator(gfx::Canvas* canvas);
 
+  // Layout the left header view.
+  void LayoutLeftHeaderView();
+
   // Returns the header bounds in the coordinates of |view_|. The header is
   // assumed to be positioned at the top left corner of |view_| and to have the
   // same width as |view_|.
@@ -80,8 +83,8 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
 
   views::Widget* frame_;
   views::View* view_;
-  views::View* window_icon_;  // May be NULL.
-  int window_icon_size_;
+  views::View* left_header_view_;  // May be NULL.
+  int left_view_x_inset_;
   FrameCaptionButtonContainerView* caption_button_container_;
 
   // The height of the header including the header/content separator.