| 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/macros.h" | 5 #include "base/macros.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 8 #include "mojo/application/content_handler_factory.h" | 8 #include "mojo/application/content_handler_factory.h" |
| 9 #include "mojo/common/data_pipe_utils.h" | 9 #include "mojo/common/data_pipe_utils.h" |
| 10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 class ForwardingApplicationImpl : public Application { | 22 class ForwardingApplicationImpl : public Application { |
| 23 public: | 23 public: |
| 24 ForwardingApplicationImpl(InterfaceRequest<Application> request, | 24 ForwardingApplicationImpl(InterfaceRequest<Application> request, |
| 25 std::string target_url) | 25 std::string target_url) |
| 26 : binding_(this, request.Pass()), | 26 : binding_(this, request.Pass()), |
| 27 target_url_(target_url) { | 27 target_url_(target_url) { |
| 28 } | 28 } |
| 29 | 29 |
| 30 private: | 30 private: |
| 31 // Application: | 31 // Application: |
| 32 void Initialize(ShellPtr shell, Array<String> args) override { | 32 void Initialize(ShellPtr shell, |
| 33 Array<String> args, |
| 34 const mojo::String& url) override { |
| 33 shell_ = shell.Pass(); | 35 shell_ = shell.Pass(); |
| 34 } | 36 } |
| 35 void AcceptConnection(const String& requestor_url, | 37 void AcceptConnection(const String& requestor_url, |
| 36 InterfaceRequest<ServiceProvider> services, | 38 InterfaceRequest<ServiceProvider> services, |
| 37 ServiceProviderPtr exposed_services) override { | 39 ServiceProviderPtr exposed_services) override { |
| 38 shell_->ConnectToApplication(target_url_, services.Pass(), | 40 shell_->ConnectToApplication(target_url_, services.Pass(), |
| 39 exposed_services.Pass()); | 41 exposed_services.Pass()); |
| 40 } | 42 } |
| 41 void RequestQuit() override { | 43 void RequestQuit() override { |
| 42 RunLoop::current()->Quit(); | 44 RunLoop::current()->Quit(); |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 }; | 83 }; |
| 82 | 84 |
| 83 } // namespace examples | 85 } // namespace examples |
| 84 } // namespace mojo | 86 } // namespace mojo |
| 85 | 87 |
| 86 MojoResult MojoMain(MojoHandle shell_handle) { | 88 MojoResult MojoMain(MojoHandle shell_handle) { |
| 87 mojo::ApplicationRunnerChromium runner( | 89 mojo::ApplicationRunnerChromium runner( |
| 88 new mojo::examples::ForwardingContentHandler()); | 90 new mojo::examples::ForwardingContentHandler()); |
| 89 return runner.Run(shell_handle); | 91 return runner.Run(shell_handle); |
| 90 } | 92 } |
| OLD | NEW |