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 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/macros.h" | 6 #include "base/macros.h" |
7 #include "examples/bitmap_uploader/bitmap_uploader.h" | 7 #include "examples/bitmap_uploader/bitmap_uploader.h" |
8 #include "examples/wm_flow/app/embedder.mojom.h" | 8 #include "examples/wm_flow/app/embedder.mojom.h" |
9 #include "examples/wm_flow/embedded/embeddee.mojom.h" | 9 #include "examples/wm_flow/embedded/embeddee.mojom.h" |
10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 virtual ~WMFlowEmbedded() {} | 53 virtual ~WMFlowEmbedded() {} |
54 | 54 |
55 private: | 55 private: |
56 // Overridden from Application: | 56 // Overridden from Application: |
57 void Initialize(mojo::ApplicationImpl* app) override { | 57 void Initialize(mojo::ApplicationImpl* app) override { |
58 shell_ = app->shell(); | 58 shell_ = app->shell(); |
59 view_manager_client_factory_.reset( | 59 view_manager_client_factory_.reset( |
60 new mojo::ViewManagerClientFactory(app->shell(), this)); | 60 new mojo::ViewManagerClientFactory(app->shell(), this)); |
61 } | 61 } |
62 bool ConfigureIncomingConnection( | 62 bool ConfigureIncomingConnection( |
63 mojo::ApplicationConnection* connection) override { | 63 mojo::ApplicationConnection* connection, |
| 64 const std::string& url) override { |
64 connection->AddService(view_manager_client_factory_.get()); | 65 connection->AddService(view_manager_client_factory_.get()); |
65 return true; | 66 return true; |
66 } | 67 } |
67 | 68 |
68 // Overridden from mojo::ViewManagerDelegate: | 69 // Overridden from mojo::ViewManagerDelegate: |
69 void OnEmbed(mojo::View* root, | 70 void OnEmbed(mojo::View* root, |
70 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 71 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
71 mojo::ServiceProviderPtr exposed_services) override { | 72 mojo::ServiceProviderPtr exposed_services) override { |
72 bitmap_uploader_.reset(new mojo::BitmapUploader(root)); | 73 bitmap_uploader_.reset(new mojo::BitmapUploader(root)); |
73 bitmap_uploader_->Init(shell_); | 74 bitmap_uploader_->Init(shell_); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 | 106 |
106 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); | 107 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); |
107 }; | 108 }; |
108 | 109 |
109 } // namespace examples | 110 } // namespace examples |
110 | 111 |
111 MojoResult MojoMain(MojoHandle shell_handle) { | 112 MojoResult MojoMain(MojoHandle shell_handle) { |
112 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); | 113 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); |
113 return runner.Run(shell_handle); | 114 return runner.Run(shell_handle); |
114 } | 115 } |
115 | |
OLD | NEW |