| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_ | 5 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_ |
| 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ | 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "services/service_manager/public/cpp/identity.h" |
| 15 #include "ui/aura/mus/window_tree_client_delegate.h" | 16 #include "ui/aura/mus/window_tree_client_delegate.h" |
| 16 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" | 17 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" |
| 17 #include "ui/views/mus/mus_export.h" | 18 #include "ui/views/mus/mus_export.h" |
| 18 #include "ui/views/mus/screen_mus_delegate.h" | 19 #include "ui/views/mus/screen_mus_delegate.h" |
| 19 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| 20 | 21 |
| 21 namespace aura { | 22 namespace aura { |
| 22 class PropertyConverter; | 23 class PropertyConverter; |
| 23 class Window; | 24 class Window; |
| 24 class WindowTreeClient; | 25 class WindowTreeClient; |
| 25 } | 26 } |
| 26 | 27 |
| 27 namespace base { | 28 namespace base { |
| 28 class SingleThreadTaskRunner; | 29 class SingleThreadTaskRunner; |
| 29 class Thread; | 30 class Thread; |
| 30 } | 31 } |
| 31 | 32 |
| 32 namespace discardable_memory { | 33 namespace discardable_memory { |
| 33 class ClientDiscardableSharedMemoryManager; | 34 class ClientDiscardableSharedMemoryManager; |
| 34 } | 35 } |
| 35 | 36 |
| 36 namespace service_manager { | 37 namespace service_manager { |
| 37 class Connector; | 38 class Connector; |
| 38 class Identity; | |
| 39 } | 39 } |
| 40 | 40 |
| 41 namespace wm { | 41 namespace wm { |
| 42 class WMState; | 42 class WMState; |
| 43 } | 43 } |
| 44 | 44 |
| 45 namespace views { | 45 namespace views { |
| 46 | 46 |
| 47 class MusClientObserver; | 47 class MusClientObserver; |
| 48 class MusPropertyMirror; | 48 class MusPropertyMirror; |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 | 153 |
| 154 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> | 154 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> |
| 155 discardable_shared_memory_manager_; | 155 discardable_shared_memory_manager_; |
| 156 | 156 |
| 157 DISALLOW_COPY_AND_ASSIGN(MusClient); | 157 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 158 }; | 158 }; |
| 159 | 159 |
| 160 } // namespace views | 160 } // namespace views |
| 161 | 161 |
| 162 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ | 162 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ |
| OLD | NEW |