| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 // TODO(sky): if we allow removal of user ids then we need to close anything | 68 // TODO(sky): if we allow removal of user ids then we need to close anything |
| 69 // associated with the user (all incoming pipes...) on removal. | 69 // associated with the user (all incoming pipes...) on removal. |
| 70 UserState* GetUserState(mojo::Connection* connection); | 70 UserState* GetUserState(mojo::Connection* connection); |
| 71 | 71 |
| 72 void AddUserIfNecessary(mojo::Connection* connection); | 72 void AddUserIfNecessary(mojo::Connection* connection); |
| 73 | 73 |
| 74 // mojo::ShellClient: | 74 // mojo::ShellClient: |
| 75 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, | 75 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, |
| 76 uint32_t id) override; | 76 uint32_t id) override; |
| 77 bool AcceptConnection(mojo::Connection* connection) override; | 77 bool AcceptConnection(mojo::Connection* connection) override; |
| 78 void ShellConnectionLost() override; |
| 78 | 79 |
| 79 // WindowServerDelegate: | 80 // WindowServerDelegate: |
| 80 void OnFirstDisplayReady() override; | 81 void OnFirstDisplayReady() override; |
| 81 void OnNoMoreDisplays() override; | 82 void OnNoMoreDisplays() override; |
| 82 scoped_ptr<ws::WindowTreeBinding> CreateWindowTreeBindingForEmbedAtWindow( | 83 scoped_ptr<ws::WindowTreeBinding> CreateWindowTreeBindingForEmbedAtWindow( |
| 83 ws::WindowServer* window_server, | 84 ws::WindowServer* window_server, |
| 84 ws::WindowTree* tree, | 85 ws::WindowTree* tree, |
| 85 mojom::WindowTreeRequest tree_request, | 86 mojom::WindowTreeRequest tree_request, |
| 86 mojom::WindowTreeClientPtr client) override; | 87 mojom::WindowTreeClientPtr client) override; |
| 87 void CreateDefaultDisplays() override; | 88 void CreateDefaultDisplays() override; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 117 PendingRequests pending_requests_; | 118 PendingRequests pending_requests_; |
| 118 | 119 |
| 119 UserIdToUserState user_id_to_user_state_; | 120 UserIdToUserState user_id_to_user_state_; |
| 120 | 121 |
| 121 DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp); | 122 DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp); |
| 122 }; | 123 }; |
| 123 | 124 |
| 124 } // namespace mus | 125 } // namespace mus |
| 125 | 126 |
| 126 #endif // COMPONENTS_MUS_MUS_APP_H_ | 127 #endif // COMPONENTS_MUS_MUS_APP_H_ |
| OLD | NEW |