Show avatar icon on V2 app's frame

ash/frame/header_painter.h

 // 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.
 
 #ifndef ASH_FRAME_HEADER_PAINTER_H_
 #define ASH_FRAME_HEADER_PAINTER_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"  // OVERRIDE
@@ skipping 38 matching lines @@
   HeaderPainter();
   virtual ~HeaderPainter();
 
   // None of the parameters are owned.
   void Init(Style style,
             views::Widget* frame,
             views::View* header_view,
             views::View* window_icon,
             FrameCaptionButtonContainerView* caption_button_container);
 
+  // Sets the window icon to the header. Passing NULL removes the window icon.
+  void UpdateWindowIcon(views::View* window_icon,
+                        const gfx::Size& window_icon_size);

[pkotwicz, 2014/03/18 04:41:15]

Can you please merge with https://codereview.chromium.org/189463013/ now that it
has landed.

Nits:
- I think that having a different method to set and clear the icon makes more
sense.
- window icon to the header -> window icon for the header

[oshima, 2014/03/18 14:57:03]

done
Nah, I think it's overkill as setting NULL to reset is pretty common.
done

+
   // Returns the bounds of the client view for a window with |header_height|
   // and |window_bounds|. The return value and |window_bounds| are in the
   // views::NonClientView's coordinates.
   static gfx::Rect GetBoundsForClientView(int header_height,
                                           const gfx::Rect& window_bounds);
 
   // Returns the bounds of the window given |header_height| and |client_bounds|.
   // The return value and |client_bounds| are in the views::NonClientView's
   // coordinates.
   static gfx::Rect GetWindowBoundsForClientBounds(
@@ skipping 84 matching lines @@
   // Get the bounds for the title. The provided |title_font_list| is used to
   // determine the correct dimensions.
   gfx::Rect GetTitleBounds(const gfx::FontList& title_font_list);
 
   Style style_;
 
   // Not owned
   views::Widget* frame_;
   views::View* header_view_;
   views::View* window_icon_;  // May be NULL.
+  gfx::Size window_icon_size_;
   FrameCaptionButtonContainerView* caption_button_container_;
 
   // The height of the header.
   int header_height_;
 
   // Image ids and opacity last used for painting header.
   int previous_theme_frame_id_;
   int previous_theme_frame_overlay_id_;
 
   // Image ids and opacity we are crossfading from.
   int crossfade_theme_frame_id_;
   int crossfade_theme_frame_overlay_id_;
 
   scoped_ptr<gfx::SlideAnimation> crossfade_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(HeaderPainter);
 };
 
 }  // namespace ash
 
 #endif  // ASH_FRAME_HEADER_PAINTER_H_