cros: CustomFrameViewAsh avatar icon from a window prop

ash/mus/window_manager.h

Index: ash/mus/window_manager.h
diff --git a/ash/mus/window_manager.h b/ash/mus/window_manager.h
index 35a7f89b03209dfb6de2786ab23e086c6a49a0d9..7aecf3f761e6950f9eb2583280802cfd938a45f7 100644
--- a/ash/mus/window_manager.h
+++ b/ash/mus/window_manager.h
@@ -7,8 +7,12 @@
 
 #include <stdint.h>
 
+#include <map>
 #include <memory>
 #include <set>
+#include <string>
+#include <unordered_map>

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

nit: not needed

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

Done.

+#include <vector>
 
 #include "ash/root_window_controller.h"
 #include "ash/shell_delegate.h"
@@ -234,9 +238,6 @@ class WindowManager : public aura::WindowManagerDelegate,
   // ShellDelegateMus is used.
   std::unique_ptr<ShellDelegate> shell_delegate_;
 
-  // See ShellPortMash's constructor for details. Tests may set to false.
-  bool create_session_state_delegate_stub_for_test_ = true;
-
   // State that is only valid during a drag.
   struct DragState;
   std::unique_ptr<DragState> drag_state_;