cros: CustomFrameViewAsh avatar icon from a window prop

ash/frame/header_view.cc

 // 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.
 
 #include "ash/frame/header_view.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/default_header_painter.h"
-#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/wm_window.h"
-#include "ui/gfx/canvas.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 HeaderView::HeaderView(views::Widget* target_widget,
                        mojom::WindowStyle window_style)
     : target_widget_(target_widget),
       header_painter_(base::MakeUnique<DefaultHeaderPainter>(window_style)),
       avatar_icon_(nullptr),
       caption_button_container_(nullptr),
       fullscreen_visible_fraction_(0) {
   caption_button_container_ =
       new FrameCaptionButtonContainerView(target_widget_);
   caption_button_container_->UpdateSizeButtonVisibility();
   AddChildView(caption_button_container_);
 
   header_painter_->Init(target_widget_, this, caption_button_container_);
-  UpdateAvatarIcon();
 
   Shell::Get()->AddShellObserver(this);
 }
 
 HeaderView::~HeaderView() {
   Shell::Get()->RemoveShellObserver(this);
 }
 
 void HeaderView::SchedulePaintForTitle() {
   header_painter_->SchedulePaintForTitle();
@@ skipping 15 matching lines @@
   // Calculating the preferred height requires at least one Layout().
   if (!did_layout_)
     Layout();
   return header_painter_->GetHeaderHeightForPainting();
 }
 
 int HeaderView::GetMinimumWidth() const {
   return header_painter_->GetMinimumHeaderWidth();
 }
 
-void HeaderView::UpdateAvatarIcon() {
-  SessionStateDelegate* delegate = ShellPort::Get()->GetSessionStateDelegate();
-  WmWindow* window = WmWindow::Get(target_widget_->GetNativeWindow());
-  bool show = delegate->ShouldShowAvatar(window);
+void HeaderView::SetAvatarIcon(const gfx::ImageSkia& avatar) {
+  const bool show = !avatar.isNull();
   if (!show) {
     if (!avatar_icon_)
       return;
     delete avatar_icon_;
     avatar_icon_ = nullptr;
   } else {
-    gfx::ImageSkia image = delegate->GetAvatarImageForWindow(window);
-    DCHECK_EQ(image.width(), image.height());
+    DCHECK_EQ(avatar.width(), avatar.height());
     if (!avatar_icon_) {
       avatar_icon_ = new views::ImageView();
       AddChildView(avatar_icon_);
     }
-    avatar_icon_->SetImage(image);
+    avatar_icon_->SetImage(avatar);
   }
   header_painter_->UpdateLeftHeaderView(avatar_icon_);
   Layout();
 }
 
 void HeaderView::SizeConstraintsChanged() {
   caption_button_container_->ResetWindowControls();
   caption_button_container_->UpdateSizeButtonVisibility();
   Layout();
 }
@@ skipping 99 matching lines @@
   gfx::Rect visible_bounds(GetVisibleBounds());
   gfx::Point visible_origin_in_screen(visible_bounds.origin());
   views::View::ConvertPointToScreen(this, &visible_origin_in_screen);
   std::vector<gfx::Rect> bounds_in_screen;
   bounds_in_screen.push_back(
       gfx::Rect(visible_origin_in_screen, visible_bounds.size()));
   return bounds_in_screen;
 }
 
 }  // namespace ash