| 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/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "components/mus/public/interfaces/window_tree.mojom.h" | 10 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 private: | 36 private: |
| 37 scoped_ptr<WindowTreeImpl> service_; | 37 scoped_ptr<WindowTreeImpl> service_; |
| 38 mojom::WindowTreeClient* client_; | 38 mojom::WindowTreeClient* client_; |
| 39 | 39 |
| 40 DISALLOW_COPY_AND_ASSIGN(ClientConnection); | 40 DISALLOW_COPY_AND_ASSIGN(ClientConnection); |
| 41 }; | 41 }; |
| 42 | 42 |
| 43 // Bindings implementation of ClientConnection. | 43 // Bindings implementation of ClientConnection. |
| 44 class DefaultClientConnection : public ClientConnection { | 44 class DefaultClientConnection : public ClientConnection { |
| 45 public: | 45 public: |
| 46 DefaultClientConnection( | 46 DefaultClientConnection(scoped_ptr<WindowTreeImpl> service_impl, |
| 47 scoped_ptr<WindowTreeImpl> service_impl, | 47 ConnectionManager* connection_manager, |
| 48 ConnectionManager* connection_manager, | 48 mojom::WindowTreeRequest service_request, |
| 49 mojo::InterfaceRequest<mojom::WindowTree> service_request, | 49 mojom::WindowTreeClientPtr client); |
| 50 mojom::WindowTreeClientPtr client); | 50 DefaultClientConnection(scoped_ptr<WindowTreeImpl> service_impl, |
| 51 ConnectionManager* connection_manager, |
| 52 mojom::WindowTreeClientPtr client); |
| 51 ~DefaultClientConnection() override; | 53 ~DefaultClientConnection() override; |
| 52 | 54 |
| 55 // Use when created with the constructor that does not take a |
| 56 // WindowTreeRequest. |
| 57 mojom::WindowTreePtr CreateInterfacePtrAndBind(); |
| 58 |
| 53 // ClientConnection: | 59 // ClientConnection: |
| 54 mojom::WindowManager* GetWindowManager() override; | 60 mojom::WindowManager* GetWindowManager() override; |
| 55 void SetIncomingMethodCallProcessingPaused(bool paused) override; | 61 void SetIncomingMethodCallProcessingPaused(bool paused) override; |
| 56 | 62 |
| 57 private: | 63 private: |
| 58 ConnectionManager* connection_manager_; | 64 ConnectionManager* connection_manager_; |
| 59 mojo::Binding<mojom::WindowTree> binding_; | 65 mojo::Binding<mojom::WindowTree> binding_; |
| 60 mojom::WindowTreeClientPtr client_; | 66 mojom::WindowTreeClientPtr client_; |
| 61 mojom::WindowManagerAssociatedPtr window_manager_internal_; | 67 mojom::WindowManagerAssociatedPtr window_manager_internal_; |
| 62 | 68 |
| 63 DISALLOW_COPY_AND_ASSIGN(DefaultClientConnection); | 69 DISALLOW_COPY_AND_ASSIGN(DefaultClientConnection); |
| 64 }; | 70 }; |
| 65 | 71 |
| 66 } // namespace ws | 72 } // namespace ws |
| 67 } // namespace mus | 73 } // namespace mus |
| 68 | 74 |
| 69 #endif // COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ | 75 #endif // COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ |
| OLD | NEW |