Show avatar icon on V2 app's frame

ash/frame/header_painter.cc

 // Copyright 2013 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/header_painter.h"
 
 #include <vector>
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 125 matching lines @@
 
 namespace ash {
 
 ///////////////////////////////////////////////////////////////////////////////
 // HeaderPainter, public:
 
 HeaderPainter::HeaderPainter()
     : frame_(NULL),
       header_view_(NULL),
       window_icon_(NULL),
+      avatar_icon_(NULL),
       caption_button_container_(NULL),
       header_height_(0),
       previous_theme_frame_id_(0),
       previous_theme_frame_overlay_id_(0),
       crossfade_theme_frame_id_(0),
       crossfade_theme_frame_overlay_id_(0) {}
 
 HeaderPainter::~HeaderPainter() {
 }
 
 void HeaderPainter::Init(
     Style style,
     views::Widget* frame,
     views::View* header_view,
     views::View* window_icon,
     FrameCaptionButtonContainerView* caption_button_container) {
   DCHECK(frame);
   DCHECK(header_view);
   // window_icon may be NULL.
   DCHECK(caption_button_container);
   style_ = style;
   frame_ = frame;
   header_view_ = header_view;
   window_icon_ = window_icon;
   caption_button_container_ = caption_button_container;
 }
 
+void HeaderPainter::UpdateAvatarIcon(views::View* avatar_icon) {
+  avatar_icon_ = avatar_icon;
+}
+
 // static
 gfx::Rect HeaderPainter::GetBoundsForClientView(
     int header_height,
     const gfx::Rect& window_bounds) {
   gfx::Rect client_bounds(window_bounds);
   client_bounds.Inset(0, header_height, 0, 0);
   return client_bounds;
 }
 
 // static
@@ skipping 173 matching lines @@
   caption_button_container_->Layout();
 
   gfx::Size caption_button_container_size =
       caption_button_container_->GetPreferredSize();
   caption_button_container_->SetBounds(
       header_view_->width() - caption_button_container_size.width(),
       0,
       caption_button_container_size.width(),
       caption_button_container_size.height());
 
+  if (avatar_icon_) {
+    int icon_offset_y =
+        GetCaptionButtonContainerCenterY() - avatar_icon_->height() / 2;
+    avatar_icon_->SetBounds(kIconOffsetX, icon_offset_y,
+                            avatar_icon_->width(), avatar_icon_->height());
+  }
+
   if (window_icon_) {
     // Vertically center the window icon with respect to the caption button
     // container.
     int icon_offset_y =
         GetCaptionButtonContainerCenterY() - window_icon_->height() / 2;
-    window_icon_->SetBounds(kIconOffsetX, icon_offset_y, kIconSize, kIconSize);
+    window_icon_->SetBounds(GetWindowIconOffsetX(), icon_offset_y,
+                            kIconSize, kIconSize);
   }
 }
 
 void HeaderPainter::SchedulePaintForTitle(
     const gfx::FontList& title_font_list) {
   header_view_->SchedulePaintInRect(GetTitleBounds(title_font_list));
 }
 
 void HeaderPainter::OnThemeChanged() {
   // We do not cache the images for |previous_theme_frame_id_| and
@@ skipping 203 matching lines @@
         IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
         IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
   }
 }
 
 gfx::Rect HeaderPainter::GetHeaderLocalBounds() const {
   return gfx::Rect(header_view_->width(), header_height_);
 }
 
 int HeaderPainter::GetTitleOffsetX() const {
-  return window_icon_ ?
-      window_icon_->bounds().right() + kTitleIconOffsetX :
+  views::View* left = window_icon_ ? window_icon_ : avatar_icon_;
+  return left ? left->bounds().right() + kTitleIconOffsetX :
       kTitleNoIconOffsetX;
 }
 
+int HeaderPainter::GetWindowIconOffsetX() const {
+  return avatar_icon_ ?
+      avatar_icon_->bounds().right() + kIconOffsetX : kIconOffsetX;
+}
+
 int HeaderPainter::GetCaptionButtonContainerCenterY() const {
   return caption_button_container_->y() +
       caption_button_container_->height() / 2;
 }
 
 int HeaderPainter::GetHeaderCornerRadius() const {
   bool square_corners = (frame_->IsMaximized() || frame_->IsFullscreen());
   const int kCornerRadius = 2;
   return square_corners ? 0 : kCornerRadius;
 }
 
 gfx::Rect HeaderPainter::GetTitleBounds(const gfx::FontList& title_font_list) {
   int title_x = GetTitleOffsetX();
   // Center the text with respect to the caption button container. This way it
   // adapts to the caption button height and aligns exactly with the window
   // icon. Don't use |window_icon_| for this computation as it may be NULL.
   int title_y =
       GetCaptionButtonContainerCenterY() - title_font_list.GetHeight() / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, caption_button_container_->x() - kTitleLogoSpacing - title_x),
       title_font_list.GetHeight());
 }
 
 }  // namespace ash