| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 COMPONENTS_MUS_CONNECTION_MANAGER_H_ | 5 #ifndef COMPONENTS_MUS_VM_CONNECTION_MANAGER_H_ |
| 6 #define COMPONENTS_MUS_CONNECTION_MANAGER_H_ | 6 #define COMPONENTS_MUS_VM_CONNECTION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
| 14 #include "components/mus/focus_controller_delegate.h" | |
| 15 #include "components/mus/ids.h" | |
| 16 #include "components/mus/public/interfaces/view_tree.mojom.h" | 14 #include "components/mus/public/interfaces/view_tree.mojom.h" |
| 17 #include "components/mus/public/interfaces/view_tree_host.mojom.h" | 15 #include "components/mus/public/interfaces/view_tree_host.mojom.h" |
| 18 #include "components/mus/server_view_delegate.h" | |
| 19 #include "components/mus/server_view_observer.h" | |
| 20 #include "components/mus/surfaces/surfaces_state.h" | 16 #include "components/mus/surfaces/surfaces_state.h" |
| 21 #include "components/mus/view_tree_host_impl.h" | 17 #include "components/mus/vm/focus_controller_delegate.h" |
| 18 #include "components/mus/vm/ids.h" |
| 19 #include "components/mus/vm/server_view_delegate.h" |
| 20 #include "components/mus/vm/server_view_observer.h" |
| 21 #include "components/mus/vm/view_tree_host_impl.h" |
| 22 #include "mojo/converters/surfaces/custom_surface_converter.h" | 22 #include "mojo/converters/surfaces/custom_surface_converter.h" |
| 23 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" | 23 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" |
| 24 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" | 24 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
| 25 | 25 |
| 26 namespace mus { | 26 namespace mus { |
| 27 | 27 |
| 28 class ClientConnection; | 28 class ClientConnection; |
| 29 class ConnectionManagerDelegate; | 29 class ConnectionManagerDelegate; |
| 30 class ServerView; | 30 class ServerView; |
| 31 class ViewTreeHostConnection; | 31 class ViewTreeHostConnection; |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 // (it's created on the stack by ViewTreeImpl). | 252 // (it's created on the stack by ViewTreeImpl). |
| 253 ScopedChange* current_change_; | 253 ScopedChange* current_change_; |
| 254 | 254 |
| 255 bool in_destructor_; | 255 bool in_destructor_; |
| 256 | 256 |
| 257 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); | 257 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); |
| 258 }; | 258 }; |
| 259 | 259 |
| 260 } // namespace mus | 260 } // namespace mus |
| 261 | 261 |
| 262 #endif // COMPONENTS_MUS_CONNECTION_MANAGER_H_ | 262 #endif // COMPONENTS_MUS_VM_CONNECTION_MANAGER_H_ |
| OLD | NEW |