cros: CustomFrameViewAsh avatar icon from a window prop

ash/mus/bridge/shell_port_mash.h

Index: ash/mus/bridge/shell_port_mash.h
diff --git a/ash/mus/bridge/shell_port_mash.h b/ash/mus/bridge/shell_port_mash.h
index a6b7b2f3f153d3099ade689a1741380fda629e5e..99d1b6507b4dae276eaea68d47a4d02353520744 100644
--- a/ash/mus/bridge/shell_port_mash.h
+++ b/ash/mus/bridge/shell_port_mash.h
@@ -40,12 +40,9 @@ class ShellPortMashTestApi;
 // ShellPort implementation for mash/mus. See ash/README.md for more.
 class ShellPortMash : public ShellPort, public WindowTreeHostManager::Observer {
  public:
-  // If |create_session_state_delegate_stub| is true SessionStateDelegateStub is
-  // created. If false, the SessionStateDelegate from Shell is used.
   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);
   ~ShellPortMash() override;
 
   static ShellPortMash* Get();
@@ -100,7 +97,6 @@ class ShellPortMash : public ShellPort, public WindowTreeHostManager::Observer {
   CreateImmersiveFullscreenController() override;
   std::unique_ptr<KeyboardUI> CreateKeyboardUI() override;
   std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override;
-  SessionStateDelegate* GetSessionStateDelegate() override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
   void AddPointerWatcher(views::PointerWatcher* watcher,
@@ -159,8 +155,6 @@ class ShellPortMash : public ShellPort, public WindowTreeHostManager::Observer {
   std::unique_ptr<MashSpecificState> mash_state_;
   std::unique_ptr<MusSpecificState> mus_state_;
 
-  std::unique_ptr<SessionStateDelegate> session_state_delegate_;
-
   std::unique_ptr<DisplaySynchronizer> display_synchronizer_;
 
   bool added_display_observer_ = false;