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 | 5 |
6 #include "base/i18n/icu_util.h" | 6 #include "base/i18n/icu_util.h" |
7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
8 #include "mojo/apps/js/application_delegate_impl.h" | 8 #include "mojo/apps/js/application_delegate_impl.h" |
9 #include "mojo/apps/js/content_handler_impl.h" | 9 #include "mojo/apps/js/content_handler_impl.h" |
10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
11 #include "mojo/public/cpp/application/application_impl.h" | 11 #include "mojo/public/cpp/application/application_impl.h" |
12 #include "mojo/public/cpp/application/interface_factory_impl.h" | 12 #include "mojo/public/cpp/application/interface_factory_impl.h" |
13 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" | 13 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" |
14 | 14 |
| 15 #ifdef V8_USE_EXTERNAL_STARTUP_DATA |
| 16 #include "gin/public/isolate_holder.h" |
| 17 #endif |
| 18 |
15 namespace mojo { | 19 namespace mojo { |
16 namespace apps { | 20 namespace apps { |
17 | 21 |
18 class ContentHandlerApplicationDelegateImpl : public ApplicationDelegateImpl { | 22 class ContentHandlerApplicationDelegateImpl : public ApplicationDelegateImpl { |
19 public: | 23 public: |
20 ContentHandlerApplicationDelegateImpl() : content_handler_factory_(this) { | 24 ContentHandlerApplicationDelegateImpl() : content_handler_factory_(this) { |
21 } | 25 } |
22 | 26 |
23 private: | 27 private: |
24 virtual bool ConfigureIncomingConnection( | 28 virtual bool ConfigureIncomingConnection( |
25 ApplicationConnection* connection) override { | 29 ApplicationConnection* connection) override { |
26 connection->AddService(&content_handler_factory_); | 30 connection->AddService(&content_handler_factory_); |
27 return true; | 31 return true; |
28 } | 32 } |
29 | 33 |
30 InterfaceFactoryImplWithContext<ContentHandlerImpl, ApplicationDelegateImpl> | 34 InterfaceFactoryImplWithContext<ContentHandlerImpl, ApplicationDelegateImpl> |
31 content_handler_factory_; | 35 content_handler_factory_; |
32 }; | 36 }; |
33 | 37 |
34 } // namespace apps | 38 } // namespace apps |
35 } // namespace mojo | 39 } // namespace mojo |
36 | 40 |
37 MojoResult MojoMain(MojoHandle shell_handle) { | 41 MojoResult MojoMain(MojoHandle shell_handle) { |
38 base::i18n::InitializeICU(); | 42 base::i18n::InitializeICU(); |
| 43 #ifdef V8_USE_EXTERNAL_STARTUP_DATA |
| 44 gin::IsolateHolder::LoadV8Snapshot(); |
| 45 #endif |
39 mojo::ApplicationRunnerChromium runner( | 46 mojo::ApplicationRunnerChromium runner( |
40 new mojo::apps::ContentHandlerApplicationDelegateImpl()); | 47 new mojo::apps::ContentHandlerApplicationDelegateImpl()); |
41 return runner.Run(shell_handle); | 48 return runner.Run(shell_handle); |
42 } | 49 } |
OLD | NEW |