| 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 #ifdef V8_USE_EXTERNAL_STARTUP_DATA |
| 7 #include "gin/public/isolate_holder.h" |
| 8 #endif // V8_USE_EXTERNAL_STARTUP_DATA |
| 6 #include "mojo/application/application_runner_chromium.h" | 9 #include "mojo/application/application_runner_chromium.h" |
| 7 #include "mojo/apps/js/application_delegate_impl.h" | 10 #include "mojo/apps/js/application_delegate_impl.h" |
| 8 #include "mojo/public/c/system/main.h" | 11 #include "mojo/public/c/system/main.h" |
| 9 | 12 |
| 10 MojoResult MojoMain(MojoHandle shell_handle) { | 13 MojoResult MojoMain(MojoHandle shell_handle) { |
| 11 base::i18n::InitializeICU(); | 14 base::i18n::InitializeICU(); |
| 15 #ifdef V8_USE_EXTERNAL_STARTUP_DATA |
| 16 gin::IsolateHolder::LoadV8Snapshot(); |
| 17 #endif // V8_USE_EXTERNAL_STARTUP_DATA |
| 12 mojo::ApplicationRunnerChromium runner( | 18 mojo::ApplicationRunnerChromium runner( |
| 13 new mojo::apps::ApplicationDelegateImpl()); | 19 new mojo::apps::ApplicationDelegateImpl()); |
| 14 return runner.Run(shell_handle); | 20 return runner.Run(shell_handle); |
| 15 } | 21 } |
| OLD | NEW |