OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "sky/shell/sky_main.h" | 5 #include "sky/shell/android/sky_main.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/at_exit.h" | 10 #include "base/at_exit.h" |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/i18n/icu_util.h" | 13 #include "base/i18n/icu_util.h" |
14 #include "base/lazy_instance.h" | 14 #include "base/lazy_instance.h" |
15 #include "base/logging.h" | 15 #include "base/logging.h" |
16 #include "base/macros.h" | 16 #include "base/macros.h" |
17 #include "base/message_loop/message_loop.h" | 17 #include "base/message_loop/message_loop.h" |
18 #include "base/run_loop.h" | 18 #include "base/run_loop.h" |
19 #include "base/threading/simple_thread.h" | 19 #include "base/threading/simple_thread.h" |
20 #include "jni/SkyMain_jni.h" | 20 #include "jni/SkyMain_jni.h" |
| 21 #include "sky/shell/service_provider.h" |
21 #include "sky/shell/shell.h" | 22 #include "sky/shell/shell.h" |
22 #include "ui/gl/gl_surface_egl.h" | 23 #include "ui/gl/gl_surface_egl.h" |
23 | 24 |
24 using base::LazyInstance; | 25 using base::LazyInstance; |
25 | 26 |
26 namespace sky { | 27 namespace sky { |
27 namespace shell { | 28 namespace shell { |
28 | 29 |
29 namespace { | 30 namespace { |
30 | 31 |
(...skipping 19 matching lines...) Expand all Loading... |
50 | 51 |
51 base::CommandLine::Init(0, nullptr); | 52 base::CommandLine::Init(0, nullptr); |
52 InitializeLogging(); | 53 InitializeLogging(); |
53 | 54 |
54 g_java_message_loop.Get().reset(new base::MessageLoopForUI); | 55 g_java_message_loop.Get().reset(new base::MessageLoopForUI); |
55 base::MessageLoopForUI::current()->Start(); | 56 base::MessageLoopForUI::current()->Start(); |
56 | 57 |
57 base::i18n::InitializeICU(); | 58 base::i18n::InitializeICU(); |
58 gfx::GLSurface::InitializeOneOff(); | 59 gfx::GLSurface::InitializeOneOff(); |
59 | 60 |
60 Shell::Init(g_java_message_loop.Get()->task_runner()); | 61 Shell::Init(make_scoped_ptr(new ServiceProviderContext( |
| 62 g_java_message_loop.Get()->task_runner()))); |
61 } | 63 } |
62 | 64 |
63 bool RegisterSkyMain(JNIEnv* env) { | 65 bool RegisterSkyMain(JNIEnv* env) { |
64 return RegisterNativesImpl(env); | 66 return RegisterNativesImpl(env); |
65 } | 67 } |
66 | 68 |
67 } // namespace sky | 69 } // namespace sky |
68 } // namespace mojo | 70 } // namespace mojo |
OLD | NEW |