cros: CustomFrameViewAsh avatar icon from a window prop

ash/frame/header_view.h

 // Copyright 2016 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_VIEW_H_
 #define ASH_FRAME_HEADER_VIEW_H_
 
 #include <memory>
+#include <vector>

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

super nit: not needed, comes from interface declaration

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

Removed. Added those because "git cl lint" complains about it.

 
 #include "ash/ash_export.h"
 #include "ash/public/interfaces/window_style.mojom.h"
 #include "ash/shared/immersive_fullscreen_controller_delegate.h"
 #include "ash/shell_observer.h"
 #include "base/macros.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/view.h"
 
+namespace gfx {
+class Canvas;

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

super nit: not needed (comes from interface declaration)

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

Removed.

+class ImageSkia;
+}
+
 namespace views {
 class ImageView;
 class Widget;
 }
 
 namespace ash {
 
 class DefaultHeaderPainter;
 class FrameCaptionButtonContainerView;
 
@@ skipping 23 matching lines @@
 
   // Returns the amount of the view's pixels which should be on screen.
   int GetPreferredOnScreenHeight();
 
   // Returns the view's preferred height.
   int GetPreferredHeight();
 
   // Returns the view's minimum width.
   int GetMinimumWidth() const;
 
-  void UpdateAvatarIcon();
+  // Sets the avatar icon to be displayed on the frame header.
+  void SetAvatarIcon(const gfx::ImageSkia& avatar);
 
   void SizeConstraintsChanged();
 
   void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
   SkColor GetActiveFrameColor() const;
   SkColor GetInactiveFrameColor() const;
 
   // views::View:
   void Layout() override;
   void OnPaint(gfx::Canvas* canvas) override;
@@ skipping 38 matching lines @@
   bool is_immersive_delegate_ = true;
 
   bool did_layout_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(HeaderView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_FRAME_HEADER_VIEW_H_