| 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_MUS_APP_H_ | 5 #ifndef COMPONENTS_MUS_MUS_APP_H_ |
| 6 #define COMPONENTS_MUS_MUS_APP_H_ | 6 #define COMPONENTS_MUS_MUS_APP_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 private: | 58 private: |
| 59 // Holds InterfaceRequests received before the first WindowTreeHost Display | 59 // Holds InterfaceRequests received before the first WindowTreeHost Display |
| 60 // has been established. | 60 // has been established. |
| 61 struct PendingRequest; | 61 struct PendingRequest; |
| 62 | 62 |
| 63 void InitializeResources(mojo::Shell* shell); | 63 void InitializeResources(mojo::Shell* shell); |
| 64 | 64 |
| 65 // mojo::ShellClient: | 65 // mojo::ShellClient: |
| 66 void Initialize(mojo::Shell* shell, const std::string& url, | 66 void Initialize(mojo::Shell* shell, const std::string& url, |
| 67 uint32_t id) override; | 67 uint32_t id, uint32_t user_id) override; |
| 68 bool AcceptConnection(mojo::Connection* connection) override; | 68 bool AcceptConnection(mojo::Connection* connection) override; |
| 69 | 69 |
| 70 // ConnectionManagerDelegate: | 70 // ConnectionManagerDelegate: |
| 71 void OnFirstRootConnectionCreated() override; | 71 void OnFirstRootConnectionCreated() override; |
| 72 void OnNoMoreRootConnections() override; | 72 void OnNoMoreRootConnections() override; |
| 73 ws::ClientConnection* CreateClientConnectionForEmbedAtWindow( | 73 ws::ClientConnection* CreateClientConnectionForEmbedAtWindow( |
| 74 ws::ConnectionManager* connection_manager, | 74 ws::ConnectionManager* connection_manager, |
| 75 mojo::InterfaceRequest<mojom::WindowTree> tree_request, | 75 mojo::InterfaceRequest<mojom::WindowTree> tree_request, |
| 76 ws::ServerWindow* root, | 76 ws::ServerWindow* root, |
| 77 uint32_t policy_bitmask, | 77 uint32_t policy_bitmask, |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 116 |
| 117 // Surfaces | 117 // Surfaces |
| 118 scoped_refptr<SurfacesState> surfaces_state_; | 118 scoped_refptr<SurfacesState> surfaces_state_; |
| 119 | 119 |
| 120 DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp); | 120 DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp); |
| 121 }; | 121 }; |
| 122 | 122 |
| 123 } // namespace mus | 123 } // namespace mus |
| 124 | 124 |
| 125 #endif // COMPONENTS_MUS_MUS_APP_H_ | 125 #endif // COMPONENTS_MUS_MUS_APP_H_ |
| OLD | NEW |