Show avatar icon on V2 app's frame

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 59 matching lines @@
 
 namespace ash {
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, public:
 
 DefaultHeaderPainter::DefaultHeaderPainter()
     : frame_(NULL),
       view_(NULL),
       window_icon_(NULL),
+      window_icon_size_(HeaderPainterUtil::GetIconSize()),

[pkotwicz, 2014/03/18 15:29:44]

It might make sense to rename HeaderPainterUtil::GetIconSize() to
HeaderPainterUtil::GetDefaultIconSize()

[oshima, 2014/03/18 16:59:50]

Done.

       caption_button_container_(NULL),
       height_(0),
       mode_(MODE_INACTIVE),
       initial_paint_(true),
       activation_animation_(new gfx::SlideAnimation(this)) {
 }
 
 DefaultHeaderPainter::~DefaultHeaderPainter() {
 }
 
@@ skipping 120 matching lines @@
       caption_button_container_->GetPreferredSize();
   caption_button_container_->SetBounds(
       view_->width() - caption_button_container_size.width(),
       0,
       caption_button_container_size.width(),
       caption_button_container_size.height());
 
   if (window_icon_) {
     // Vertically center the window icon with respect to the caption button
     // container.
-    int icon_size = HeaderPainterUtil::GetIconSize();
-    int icon_offset_y = (caption_button_container_->height() - icon_size) / 2;
+    int icon_offset_y =
+        (caption_button_container_->height() - window_icon_size_) / 2;
     window_icon_->SetBounds(HeaderPainterUtil::GetIconXOffset(), icon_offset_y,
-        icon_size, icon_size);
+                            window_icon_size_, window_icon_size_);
   }
 
   SetHeaderHeightForPainting(caption_button_container_->height() +
       kHeaderContentSeparatorSize);
 }
 
 int DefaultHeaderPainter::GetHeaderHeightForPainting() const {
   return height_;
 }
 
 void DefaultHeaderPainter::SetHeaderHeightForPainting(int height) {
   height_ = height;
 }
 
 void DefaultHeaderPainter::SchedulePaintForTitle() {
   view_->SchedulePaintInRect(GetTitleBounds());
 }
 
+void DefaultHeaderPainter::UpdateWindowIcon(views::View* window_icon,
+                                            int window_icon_size) {
+  window_icon_ = window_icon;
+  window_icon_size_ = window_icon_size;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // gfx::AnimationDelegate overrides:
 
 void DefaultHeaderPainter::AnimationProgressed(
     const gfx::Animation* animation) {
   view_->SchedulePaintInRect(GetLocalBounds());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, private:
@@ skipping 58 matching lines @@
 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());
 }
 
 }  // namespace ash