| 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 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 private: | 30 private: |
| 31 // Application: | 31 // Application: |
| 32 void Initialize(ShellPtr shell, | 32 void Initialize(ShellPtr shell, |
| 33 Array<String> args, | 33 Array<String> args, |
| 34 const mojo::String& url) override { | 34 const mojo::String& url) override { |
| 35 shell_ = shell.Pass(); | 35 shell_ = shell.Pass(); |
| 36 } | 36 } |
| 37 void AcceptConnection(const String& requestor_url, | 37 void AcceptConnection(const String& requestor_url, |
| 38 InterfaceRequest<ServiceProvider> services, | 38 InterfaceRequest<ServiceProvider> services, |
| 39 ServiceProviderPtr exposed_services) override { | 39 ServiceProviderPtr exposed_services, |
| 40 const String& requested_url) override { |
| 40 shell_->ConnectToApplication(target_url_, services.Pass(), | 41 shell_->ConnectToApplication(target_url_, services.Pass(), |
| 41 exposed_services.Pass()); | 42 exposed_services.Pass()); |
| 42 } | 43 } |
| 43 void RequestQuit() override { | 44 void RequestQuit() override { |
| 44 RunLoop::current()->Quit(); | 45 RunLoop::current()->Quit(); |
| 45 } | 46 } |
| 46 | 47 |
| 47 Binding<Application> binding_; | 48 Binding<Application> binding_; |
| 48 std::string target_url_; | 49 std::string target_url_; |
| 49 ShellPtr shell_; | 50 ShellPtr shell_; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 }; | 84 }; |
| 84 | 85 |
| 85 } // namespace examples | 86 } // namespace examples |
| 86 } // namespace mojo | 87 } // namespace mojo |
| 87 | 88 |
| 88 MojoResult MojoMain(MojoHandle shell_handle) { | 89 MojoResult MojoMain(MojoHandle shell_handle) { |
| 89 mojo::ApplicationRunnerChromium runner( | 90 mojo::ApplicationRunnerChromium runner( |
| 90 new mojo::examples::ForwardingContentHandler()); | 91 new mojo::examples::ForwardingContentHandler()); |
| 91 return runner.Run(shell_handle); | 92 return runner.Run(shell_handle); |
| 92 } | 93 } |
| OLD | NEW |