| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ | 5 #ifndef SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ |
| 6 #define SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ | 6 #define SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 ViewManagerApp(); | 23 ViewManagerApp(); |
| 24 ~ViewManagerApp() override; | 24 ~ViewManagerApp() override; |
| 25 | 25 |
| 26 private: | 26 private: |
| 27 // |ApplicationDelegate|: | 27 // |ApplicationDelegate|: |
| 28 void Initialize(mojo::ApplicationImpl* app_impl) override; | 28 void Initialize(mojo::ApplicationImpl* app_impl) override; |
| 29 bool ConfigureIncomingConnection( | 29 bool ConfigureIncomingConnection( |
| 30 mojo::ServiceProviderImpl* service_provider_impl) override; | 30 mojo::ServiceProviderImpl* service_provider_impl) override; |
| 31 | 31 |
| 32 void OnCompositorConnectionError(); | 32 void OnCompositorConnectionError(); |
| 33 void OnAssociateConnectionError(const std::string& url); | |
| 34 | 33 |
| 35 void Shutdown(); | 34 void Shutdown(); |
| 36 | 35 |
| 37 mojo::ApplicationImpl* app_impl_; | 36 mojo::ApplicationImpl* app_impl_; |
| 38 mojo::TracingImpl tracing_; | 37 mojo::TracingImpl tracing_; |
| 39 | 38 |
| 40 mojo::StrongBindingSet<mojo::ui::ViewManager> view_managers_; | 39 mojo::StrongBindingSet<mojo::ui::ViewManager> view_managers_; |
| 41 std::unique_ptr<ViewRegistry> registry_; | 40 std::unique_ptr<ViewRegistry> registry_; |
| 42 | 41 |
| 43 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp); | 42 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp); |
| 44 }; | 43 }; |
| 45 | 44 |
| 46 } // namespace view_manager | 45 } // namespace view_manager |
| 47 | 46 |
| 48 #endif // SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ | 47 #endif // SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ |
| OLD | NEW |