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_LAUNCHER_LAUNCHER_APP_H_ | 5 #ifndef SERVICES_UI_LAUNCHER_LAUNCHER_APP_H_ |
6 #define SERVICES_UI_LAUNCHER_LAUNCHER_APP_H_ | 6 #define SERVICES_UI_LAUNCHER_LAUNCHER_APP_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <unordered_map> | 9 #include <unordered_map> |
10 | 10 |
(...skipping 14 matching lines...) Expand all Loading... |
25 // |ApplicationDelegate|: | 25 // |ApplicationDelegate|: |
26 void Initialize(mojo::ApplicationImpl* app_impl) override; | 26 void Initialize(mojo::ApplicationImpl* app_impl) override; |
27 void InitCompositor(); | 27 void InitCompositor(); |
28 void InitViewManager(); | 28 void InitViewManager(); |
29 void InitViewAssociates(const std::string& associate_urls_command_line_param); | 29 void InitViewAssociates(const std::string& associate_urls_command_line_param); |
30 bool ConfigureIncomingConnection( | 30 bool ConfigureIncomingConnection( |
31 mojo::ServiceProviderImpl* service_provider_impl) override; | 31 mojo::ServiceProviderImpl* service_provider_impl) override; |
32 | 32 |
33 // |Launcher|: | 33 // |Launcher|: |
34 void Launch(const mojo::String& application_url) override; | 34 void Launch(const mojo::String& application_url) override; |
| 35 void LaunchOnViewport( |
| 36 mojo::InterfaceHandle<mojo::NativeViewport> viewport, |
| 37 mojo::InterfaceHandle<mojo::ui::ViewProvider> view_provider) override; |
35 | 38 |
| 39 void LaunchInternal(mojo::NativeViewportPtr viewport, |
| 40 mojo::ui::ViewProviderPtr view_provider); |
36 void OnLaunchTermination(uint32_t id); | 41 void OnLaunchTermination(uint32_t id); |
37 | 42 |
38 void OnCompositorConnectionError(); | 43 void OnCompositorConnectionError(); |
39 void OnViewManagerConnectionError(); | 44 void OnViewManagerConnectionError(); |
40 void OnViewAssociateConnectionError(); | 45 void OnViewAssociateConnectionError(); |
41 | 46 |
42 mojo::ApplicationImpl* app_impl_; | 47 mojo::ApplicationImpl* app_impl_; |
43 mojo::TracingImpl tracing_; | 48 mojo::TracingImpl tracing_; |
44 | 49 |
45 mojo::BindingSet<Launcher> bindings_; | 50 mojo::BindingSet<Launcher> bindings_; |
46 std::unordered_map<uint32_t, std::unique_ptr<LaunchInstance>> | 51 std::unordered_map<uint32_t, std::unique_ptr<LaunchInstance>> |
47 launch_instances_; | 52 launch_instances_; |
48 | 53 |
49 uint32_t next_id_; | 54 uint32_t next_id_; |
50 | 55 |
51 mojo::gfx::composition::CompositorPtr compositor_; | 56 mojo::gfx::composition::CompositorPtr compositor_; |
52 mojo::ui::ViewManagerPtr view_manager_; | 57 mojo::ui::ViewManagerPtr view_manager_; |
53 std::vector<mojo::ui::ViewAssociateOwnerPtr> view_associate_owners_; | 58 std::vector<mojo::ui::ViewAssociateOwnerPtr> view_associate_owners_; |
54 | 59 |
55 DISALLOW_COPY_AND_ASSIGN(LauncherApp); | 60 DISALLOW_COPY_AND_ASSIGN(LauncherApp); |
56 }; | 61 }; |
57 | 62 |
58 } // namespace launcher | 63 } // namespace launcher |
59 | 64 |
60 #endif // SERVICES_UI_LAUNCHER_LAUNCHER_APP_H_ | 65 #endif // SERVICES_UI_LAUNCHER_LAUNCHER_APP_H_ |
OLD | NEW |