| 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_WS_CLIENT_CONNECTION_H_ | 5 #ifndef COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ |
| 6 #define COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ | 6 #define COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 9 #include "components/mus/public/interfaces/window_tree.mojom.h" | 10 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| 10 #include "mojo/public/cpp/bindings/binding.h" | 11 #include "mojo/public/cpp/bindings/binding.h" |
| 11 | 12 |
| 12 namespace mus { | 13 namespace mus { |
| 13 namespace ws { | 14 namespace ws { |
| 14 | 15 |
| 15 class ConnectionManager; | 16 class ConnectionManager; |
| 16 class WindowTreeImpl; | 17 class WindowTreeImpl; |
| 17 | 18 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 mojom::WindowTreeClientPtr client_; | 57 mojom::WindowTreeClientPtr client_; |
| 57 mojom::WindowManagerInternalAssociatedPtr window_manager_internal_; | 58 mojom::WindowManagerInternalAssociatedPtr window_manager_internal_; |
| 58 | 59 |
| 59 DISALLOW_COPY_AND_ASSIGN(DefaultClientConnection); | 60 DISALLOW_COPY_AND_ASSIGN(DefaultClientConnection); |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 } // namespace ws | 63 } // namespace ws |
| 63 } // namespace mus | 64 } // namespace mus |
| 64 | 65 |
| 65 #endif // COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ | 66 #endif // COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ |
| OLD | NEW |