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

ash/frame/custom_frame_view_ash.cc

 // Copyright (c) 2012 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/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 193 matching lines @@
   // that the window frame can be minimized if it can be maximized.
   FrameCaptionButtonContainerView::MinimizeAllowed minimize_allowed =
       frame_->widget_delegate()->CanMaximize() ?
           FrameCaptionButtonContainerView::MINIMIZE_ALLOWED :
           FrameCaptionButtonContainerView::MINIMIZE_DISALLOWED;
   caption_button_container_ = new FrameCaptionButtonContainerView(frame_,
       minimize_allowed);
   caption_button_container_->UpdateSizeButtonVisibility();
   AddChildView(caption_button_container_);
 
-  header_painter_->Init(frame_, this, NULL, caption_button_container_);
+  header_painter_->Init(frame_, this, caption_button_container_);
   UpdateAvatarIcon();
 
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 CustomFrameViewAsh::HeaderView::~HeaderView() {
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void CustomFrameViewAsh::HeaderView::SchedulePaintForTitle() {
@@ skipping 18 matching lines @@
 
 int CustomFrameViewAsh::HeaderView::GetMinimumWidth() const {
   return header_painter_->GetMinimumHeaderWidth();
 }
 
 void CustomFrameViewAsh::HeaderView::UpdateAvatarIcon() {
   SessionStateDelegate* delegate =
       Shell::GetInstance()->session_state_delegate();
   aura::Window* window = frame_->GetNativeView();
   bool show = delegate->ShouldShowAvatar(window);
-  int icon_size = 0;
   if (!show) {
     if (!avatar_icon_)
       return;
     delete avatar_icon_;
     avatar_icon_ = NULL;
   } else {
     gfx::ImageSkia image = GetAvatarImageForContext(
         delegate->GetBrowserContextForWindow(window)).AsImageSkia();
     DCHECK(!image.isNull());
     DCHECK_EQ(image.width(), image.height());
     if (!avatar_icon_) {
       avatar_icon_ = new views::ImageView();
       AddChildView(avatar_icon_);
     }
     avatar_icon_->SetImage(image);
-    icon_size = image.width();
   }
-  header_painter_->UpdateWindowIcon(avatar_icon_, icon_size);
+  header_painter_->UpdateLeftHeaderView(avatar_icon_);
   Layout();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::HeaderView, views::View overrides:
 
 void CustomFrameViewAsh::HeaderView::Layout() {
   header_painter_->LayoutHeader();
 }
 
@@ skipping 288 matching lines @@
 FrameCaptionButtonContainerView* CustomFrameViewAsh::
     GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash