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/i18n/icu_util.h" | 5 #include "base/i18n/icu_util.h" |
6 #include "gin/array_buffer.h" | 6 #include "gin/array_buffer.h" |
7 #include "gin/public/isolate_holder.h" | 7 #include "gin/public/isolate_holder.h" |
8 #include "mojo/application/application_runner_chromium.h" | 8 #include "mojo/application/application_runner_chromium.h" |
9 #include "mojo/application/content_handler_factory.h" | 9 #include "mojo/application/content_handler_factory.h" |
10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 static const char v8Flags[] = "--harmony-classes"; | 25 static const char v8Flags[] = "--harmony-classes"; |
26 v8::V8::SetFlagsFromString(v8Flags, sizeof(v8Flags) - 1); | 26 v8::V8::SetFlagsFromString(v8Flags, sizeof(v8Flags) - 1); |
27 base::i18n::InitializeICU(); | 27 base::i18n::InitializeICU(); |
28 gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode, | 28 gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode, |
29 gin::ArrayBufferAllocator::SharedInstance()); | 29 gin::ArrayBufferAllocator::SharedInstance()); |
30 } | 30 } |
31 | 31 |
32 // Overridden from ApplicationDelegate: | 32 // Overridden from ApplicationDelegate: |
33 bool ConfigureIncomingConnection( | 33 bool ConfigureIncomingConnection( |
34 mojo::ApplicationConnection* connection) override { | 34 mojo::ApplicationConnection* connection) override { |
35 connection->AddService(&content_handler_factory_); | 35 connection->GetServiceProviderImpl().AddService<mojo::ContentHandler>( |
| 36 content_handler_factory_.GetInterfaceRequestHandler()); |
36 return true; | 37 return true; |
37 } | 38 } |
38 | 39 |
39 // Overridden from ContentHandlerFactory::ManagedDelegate: | 40 // Overridden from ContentHandlerFactory::ManagedDelegate: |
40 scoped_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder> | 41 scoped_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder> |
41 CreateApplication( | 42 CreateApplication( |
42 mojo::InterfaceRequest<mojo::Application> application_request, | 43 mojo::InterfaceRequest<mojo::Application> application_request, |
43 mojo::URLResponsePtr response) override { | 44 mojo::URLResponsePtr response) override { |
44 return make_scoped_ptr( | 45 return make_scoped_ptr( |
45 new JSApp(application_request.Pass(), response.Pass())); | 46 new JSApp(application_request.Pass(), response.Pass())); |
46 } | 47 } |
47 | 48 |
48 mojo::ContentHandlerFactory content_handler_factory_; | 49 mojo::ContentHandlerFactory content_handler_factory_; |
49 | 50 |
50 DISALLOW_COPY_AND_ASSIGN(JsContentHandler); | 51 DISALLOW_COPY_AND_ASSIGN(JsContentHandler); |
51 }; | 52 }; |
52 | 53 |
53 } // namespace js | 54 } // namespace js |
54 | 55 |
55 MojoResult MojoMain(MojoHandle application_request) { | 56 MojoResult MojoMain(MojoHandle application_request) { |
56 mojo::ApplicationRunnerChromium runner(new js::JsContentHandler); | 57 mojo::ApplicationRunnerChromium runner(new js::JsContentHandler); |
57 return runner.Run(application_request); | 58 return runner.Run(application_request); |
58 } | 59 } |
OLD | NEW |