| 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/client/capture_client.h" | 16 #include "ui/aura/client/capture_client.h" |
| 16 #include "ui/aura/mus/window_tree_client_delegate.h" | 17 #include "ui/aura/mus/window_tree_client_delegate.h" |
| 17 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" | 18 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" |
| 18 #include "ui/views/mus/mus_export.h" | 19 #include "ui/views/mus/mus_export.h" |
| 19 #include "ui/views/mus/screen_mus_delegate.h" | 20 #include "ui/views/mus/screen_mus_delegate.h" |
| 20 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
| 21 | 22 |
| 22 namespace aura { | 23 namespace aura { |
| 23 class PropertyConverter; | 24 class PropertyConverter; |
| 24 class Window; | 25 class Window; |
| 25 class WindowTreeClient; | 26 class WindowTreeClient; |
| 26 } | 27 } |
| 27 | 28 |
| 28 namespace base { | 29 namespace base { |
| 29 class SingleThreadTaskRunner; | 30 class SingleThreadTaskRunner; |
| 30 class Thread; | 31 class Thread; |
| 31 } | 32 } |
| 32 | 33 |
| 33 namespace discardable_memory { | 34 namespace discardable_memory { |
| 34 class ClientDiscardableSharedMemoryManager; | 35 class ClientDiscardableSharedMemoryManager; |
| 35 } | 36 } |
| 36 | 37 |
| 37 namespace service_manager { | 38 namespace service_manager { |
| 38 class Connector; | 39 class Connector; |
| 39 class Identity; | |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace wm { | 42 namespace wm { |
| 43 class WMState; | 43 class WMState; |
| 44 } | 44 } |
| 45 | 45 |
| 46 namespace views { | 46 namespace views { |
| 47 | 47 |
| 48 class MusClientObserver; | 48 class MusClientObserver; |
| 49 class MusPropertyMirror; | 49 class MusPropertyMirror; |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 | 162 |
| 163 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> | 163 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> |
| 164 discardable_shared_memory_manager_; | 164 discardable_shared_memory_manager_; |
| 165 | 165 |
| 166 DISALLOW_COPY_AND_ASSIGN(MusClient); | 166 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 167 }; | 167 }; |
| 168 | 168 |
| 169 } // namespace views | 169 } // namespace views |
| 170 | 170 |
| 171 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ | 171 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ |
| OLD | NEW |