cros: CustomFrameViewAsh avatar icon from a window prop

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 <memory>
 
 #include "ash/ash_export.h"
@@ skipping 24 matching lines @@
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   // |enable_immersive| controls whether ImmersiveFullscreenController is
   // created for the CustomFrameViewAsh; if true and a WindowStateDelegate has
   // not been set on the WindowState associated with |frame|, then an
   // ImmersiveFullscreenController is created.
   // If ImmersiveFullscreenControllerDelegate is not supplied, HeaderView is
   // used as the ImmersiveFullscreenControllerDelegate.
-  explicit CustomFrameViewAsh(
+  CustomFrameViewAsh(

[James Cook, 2017/05/30 21:27:15]

nit: I think we still want "explicit" here, since there is 1 non-default
parameter.

[xiyuan, 2017/05/30 22:44:14]

I see. Restored "explicit".

       views::Widget* frame,
       ImmersiveFullscreenControllerDelegate* immersive_delegate = nullptr,
       bool enable_immersive = true,
       mojom::WindowStyle window_style = mojom::WindowStyle::DEFAULT);
   ~CustomFrameViewAsh() override;
 
   // Inits |immersive_fullscreen_controller| so that the controller reveals
   // and hides |header_view_| in immersive fullscreen.
   // CustomFrameViewAsh does not take ownership of
   // |immersive_fullscreen_controller|.
   void InitImmersiveFullscreenControllerForView(
       ImmersiveFullscreenController* immersive_fullscreen_controller);
 
   // Sets the active and inactive frame colors. Note the inactive frame color
   // will have some transparency added when the frame is drawn.
   void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
 
   // Sets the height of the header. If |height| has no value (the default), the
   // preferred height is used.
   void SetHeaderHeight(base::Optional<int> height);
 
-  views::View* header_view();
+  // Get the view of the header.
+  views::View* GetHeaderView();
 
   // views::NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
   int NonClientHitTest(const gfx::Point& point) override;
   void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
   void ResetWindowControls() override;
   void UpdateWindowIcon() override;
   void UpdateWindowTitle() override;
   void SizeConstraintsChanged() override;
   void ActivationChanged(bool active) override;
 
   // views::View:
   gfx::Size CalculatePreferredSize() const override;
   void Layout() override;
   const char* GetClassName() const override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
   void SchedulePaintInRect(const gfx::Rect& r) override;
-  void VisibilityChanged(views::View* starting_from, bool is_visible) override;
-
-  // Get the view of the header.
-  views::View* GetHeaderView();
 
   const views::View* GetAvatarIconViewForTest() const;
 
  private:
+  class AvatarObserver;
   class OverlayView;
   friend class TestWidgetConstraintsDelegate;
   friend class CustomFrameViewAshSizeLock;
 
   // views::NonClientFrameView:
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
   // Returns the container for the minimize/maximize/close buttons that is held
   // by the HeaderView. Used in testing.
   FrameCaptionButtonContainerView* GetFrameCaptionButtonContainerViewForTest();
 
   // 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.
   HeaderView* header_view_;
 
   OverlayView* overlay_view_;
 
   ImmersiveFullscreenControllerDelegate* immersive_delegate_;
 
+  // Observes avatar icon change and updates |header_view_|.
+  std::unique_ptr<AvatarObserver> avatar_observer_;
+
   static bool use_empty_minimum_size_for_test_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
 };
 
 }  // namespace ash
 
 #endif  // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_