cros: CustomFrameViewAsh avatar icon from a window prop

ash/mus/window_manager.h

 // Copyright 2015 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_WINDOW_MANAGER_H_
 #define ASH_MUS_WINDOW_MANAGER_H_
 
 #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"
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/interfaces/display/display_controller.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/mus/window_manager_delegate.h"
@@ skipping 205 matching lines @@
 
   std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
   uint16_t next_accelerator_namespace_id_ = 0u;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   // The ShellDelegate to install. This may be null, in which case
   // 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_;
 
   std::unique_ptr<ui::InputDeviceClient> input_device_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_