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 301 matching lines @@
   SkScalar y = SkIntToScalar(height_) - SkFloatToScalar(thickness);
   canvas->sk_canvas()->drawLine(0, y, SkIntToScalar(view_->width()), y, paint);
 }
 
 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());
+      GetViewToLeftOfTitle(), caption_button_container_, GetTitleFontList());
+}
+
+views::View* DefaultHeaderPainter::GetViewToLeftOfTitle() const {
+  return window_icon_;
 }
 
 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