cros: CustomFrameViewAsh avatar icon from a window prop

ash/mus/bridge/shell_port_mash.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/mus/bridge/shell_port_mash.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
@@ skipping 12 matching lines @@
 #include "ash/mus/display_synchronizer.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/keyboard_ui_mus.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/touch_transform_setter_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
-#include "ash/session/session_state_delegate.h"
 #include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_init_params.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/touch/touch_uma.h"
 #include "ash/virtual_keyboard_controller.h"
 #include "ash/wallpaper/wallpaper_delegate.h"
 #include "ash/wm/drag_window_resizer.h"
@@ skipping 25 matching lines @@
 #include "ui/display/types/native_display_delegate.h"
 #include "ui/views/mus/pointer_watcher_event_router.h"
 
 #if defined(USE_OZONE)
 #include "ui/display/manager/forwarding_display_delegate.h"
 #endif
 
 namespace ash {
 namespace mus {
 
-namespace {
-
-// TODO(jamescook): After ShellDelegate is ported to ash/common use
-// ShellDelegate::CreateSessionStateDelegate() to construct the mus version
-// of SessionStateDelegate.
-class SessionStateDelegateStub : public SessionStateDelegate {
- public:
-  SessionStateDelegateStub() : user_info_(new user_manager::UserInfoImpl()) {}
-
-  ~SessionStateDelegateStub() override {}
-
-  // SessionStateDelegate:
-  bool ShouldShowAvatar(WmWindow* window) const override {
-    NOTIMPLEMENTED();
-    return !user_info_->GetImage().isNull();
-  }
-  gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override {
-    NOTIMPLEMENTED();
-    return gfx::ImageSkia();
-  }
-
- private:
-  // A pseudo user info.
-  std::unique_ptr<user_manager::UserInfo> user_info_;
-
-  DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
-};
-
-}  // namespace
-
 ShellPortMash::MashSpecificState::MashSpecificState() = default;
 
 ShellPortMash::MashSpecificState::~MashSpecificState() = default;
 
 ShellPortMash::MusSpecificState::MusSpecificState() = default;
 
 ShellPortMash::MusSpecificState::~MusSpecificState() = default;
 
 ShellPortMash::ShellPortMash(
     aura::Window* primary_root_window,
     WindowManager* window_manager,
-    views::PointerWatcherEventRouter* pointer_watcher_event_router,
-    bool create_session_state_delegate_stub)
+    views::PointerWatcherEventRouter* pointer_watcher_event_router)
     : window_manager_(window_manager),
       primary_root_window_(primary_root_window) {
-  if (create_session_state_delegate_stub)
-    session_state_delegate_ = base::MakeUnique<SessionStateDelegateStub>();
-
   if (GetAshConfig() == Config::MASH) {
     mash_state_ = base::MakeUnique<MashSpecificState>();
     mash_state_->pointer_watcher_event_router = pointer_watcher_event_router;
     mash_state_->immersive_handler_factory =
         base::MakeUnique<ImmersiveHandlerFactoryMus>();
   } else {
     DCHECK_EQ(Config::MUS, GetAshConfig());
     mus_state_ = base::MakeUnique<MusSpecificState>();
   }
 }
@@ skipping 285 matching lines @@
 
 std::unique_ptr<KeyEventWatcher> ShellPortMash::CreateKeyEventWatcher() {
   if (GetAshConfig() == Config::MUS)
     return base::MakeUnique<KeyEventWatcherAura>();
 
   // TODO: needs implementation for mus, http://crbug.com/649600.
   NOTIMPLEMENTED();
   return std::unique_ptr<KeyEventWatcher>();
 }
 
-SessionStateDelegate* ShellPortMash::GetSessionStateDelegate() {
-  return session_state_delegate_ ? session_state_delegate_.get()
-                                 : Shell::Get()->session_state_delegate();
-}
-
 void ShellPortMash::AddDisplayObserver(WmDisplayObserver* observer) {
   // TODO(sky): mash should use the same code as mus/classic and
   // WmDisplayObserver should be removed; http://crbug.com/718860.
   if (GetAshConfig() == Config::MASH) {
     NOTIMPLEMENTED();
     return;
   }
   if (!added_display_observer_) {
     added_display_observer_ = true;
     Shell::Get()->window_tree_host_manager()->AddObserver(this);
@@ skipping 190 matching lines @@
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortMash::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace mus
 }  // namespace ash