Show avatar icon on V2 app's frame

ash/frame/custom_frame_view_ash.h

 // 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.
 
 #ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
 
 #include "ash/ash_export.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace ash {
 class FrameBorderHitTestController;
-class HeaderPainter;
 class ImmersiveFullscreenController;
 }
 namespace views {
+class ImageView;
 class Widget;
 }
 
 namespace ash {
 
 // A NonClientFrameView used for packaged apps, dialogs and other non-browser
 // windows. It supports immersive fullscreen. When in immersive fullscreen, the
 // client view takes up the entire widget and the window header is an overlay.
 // The window header overlay slides onscreen when the user hovers the mouse at
 // the top of the screen. See also views::CustomFrameView and
@@ skipping 24 matching lines @@
   virtual void UpdateWindowIcon() OVERRIDE;
   virtual void UpdateWindowTitle() OVERRIDE;
 
   // views::View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
   virtual gfx::Size GetMinimumSize() OVERRIDE;
   virtual gfx::Size GetMaximumSize() OVERRIDE;
   virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE;
   virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
+  virtual void VisibilityChanged(views::View* starting_from,
+                                 bool is_visible) OVERRIDE;
 
   // Get the view of the header.
   views::View* GetHeaderView();
 
+  const views::View* GetAvatarIconViewForTest() const;

[oshima, 2014/03/14 20:40:44]

I'm doing here as I've been told this is better than adding FIXTURE/friend class
in another review. I'm fine with either way, so please let me know if I should
move this to private.

[Mr4D (OOO till 08-26), 2014/03/14 22:01:30]

I usually do it this way. All the testing related functions come at the end of
the public section.

I am not a fan of "friending" for test classes...

+
  private:
   class OverlayView;
   friend class TestWidgetConstraintsDelegate;
 
   // Height from top of window to top of client area.
   int NonClientTopBorderHeight() const;
 
   // Not owned.
   views::Widget* frame_;
 
   // View which contains the title and window controls.
   class HeaderView;
   HeaderView* header_view_;
 
   // Updates the hittest bounds overrides based on the window state type.
   scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
 };
 
 }  // namespace ash
 
 #endif  // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_