cros: CustomFrameViewAsh avatar icon from a window prop

ash/mus/bridge/shell_port_mash.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_MUS_BRIDGE_SHELL_PORT_MASH_H_
 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 22 matching lines @@
 
 class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class ImmersiveHandlerFactoryMus;
 class WindowManager;
 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();
 
   ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id);
 
   AcceleratorControllerDelegateAura* accelerator_controller_delegate_mus() {
     return mus_state_->accelerator_controller_delegate.get();
   }
 
@@ skipping 34 matching lines @@
   std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
       override;
   std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
       aura::Window* workspace_window) override;
   std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
   CreateScopedDisableInternalMouseAndKeyboard() override;
   std::unique_ptr<ImmersiveFullscreenController>
   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,
                          views::PointerWatcherEventTypes events) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
   bool IsTouchDown() override;
   void ToggleIgnoreExternalKeyboard() override;
   void SetLaserPointerEnabled(bool enabled) override;
   void SetPartialMagnifierEnabled(bool enabled) override;
   void CreatePointerWatcherAdapter() override;
@@ skipping 38 matching lines @@
   WindowManager* window_manager_;
 
   // TODO(sky): remove this once mash supports simple display management.
   aura::Window* primary_root_window_;
 
   // Only one of |mash_state_| or |mus_state_| is created, depending upon
   // Config.
   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;
   base::ObserverList<WmDisplayObserver> display_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellPortMash);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_