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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "mojo/application/application_runner_chromium.h" | 9 #include "mojo/application/application_runner_chromium.h" |
10 #include "mojo/application/content_handler_factory.h" | 10 #include "mojo/application/content_handler_factory.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 }; | 52 }; |
53 | 53 |
54 class ForwardingContentHandler : public ApplicationDelegate, | 54 class ForwardingContentHandler : public ApplicationDelegate, |
55 public ContentHandlerFactory::ManagedDelegate { | 55 public ContentHandlerFactory::ManagedDelegate { |
56 public: | 56 public: |
57 ForwardingContentHandler() : content_handler_factory_(this) {} | 57 ForwardingContentHandler() : content_handler_factory_(this) {} |
58 | 58 |
59 private: | 59 private: |
60 // Overridden from ApplicationDelegate: | 60 // Overridden from ApplicationDelegate: |
61 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { | 61 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { |
62 connection->AddService(&content_handler_factory_); | 62 connection->GetServiceProviderImpl().AddService<ContentHandler>( |
| 63 content_handler_factory_.GetInterfaceRequestHandler()); |
63 return true; | 64 return true; |
64 } | 65 } |
65 | 66 |
66 // Overridden from ContentHandlerFactory::ManagedDelegate: | 67 // Overridden from ContentHandlerFactory::ManagedDelegate: |
67 scoped_ptr<ContentHandlerFactory::HandledApplicationHolder> | 68 scoped_ptr<ContentHandlerFactory::HandledApplicationHolder> |
68 CreateApplication(InterfaceRequest<Application> application_request, | 69 CreateApplication(InterfaceRequest<Application> application_request, |
69 URLResponsePtr response) override { | 70 URLResponsePtr response) override { |
70 CHECK(!response.is_null()); | 71 CHECK(!response.is_null()); |
71 const std::string requestor_url(response->url); | 72 const std::string requestor_url(response->url); |
72 std::string target_url; | 73 std::string target_url; |
(...skipping 11 matching lines...) Expand all Loading... |
84 }; | 85 }; |
85 | 86 |
86 } // namespace examples | 87 } // namespace examples |
87 } // namespace mojo | 88 } // namespace mojo |
88 | 89 |
89 MojoResult MojoMain(MojoHandle application_request) { | 90 MojoResult MojoMain(MojoHandle application_request) { |
90 mojo::ApplicationRunnerChromium runner( | 91 mojo::ApplicationRunnerChromium runner( |
91 new mojo::examples::ForwardingContentHandler()); | 92 new mojo::examples::ForwardingContentHandler()); |
92 return runner.Run(application_request); | 93 return runner.Run(application_request); |
93 } | 94 } |
OLD | NEW |