Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: sky/shell/android/sky_main.cc

Issue 1139873004: Make android directory for Android-specific bits of SkyShell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/shell/android/sky_main.h ('k') | sky/shell/android/tracing_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/shell/android/sky_main.cc
diff --git a/sky/shell/sky_main.cc b/sky/shell/android/sky_main.cc
similarity index 90%
rename from sky/shell/sky_main.cc
rename to sky/shell/android/sky_main.cc
index 4a10ab0df3f30fa1a575c62db55b7bb00e1d116f..98118282dbd1e2f1d6bc78df400496de3caa426a 100644
--- a/sky/shell/sky_main.cc
+++ b/sky/shell/android/sky_main.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sky/shell/sky_main.h"
+#include "sky/shell/android/sky_main.h"
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
@@ -18,6 +18,7 @@
#include "base/run_loop.h"
#include "base/threading/simple_thread.h"
#include "jni/SkyMain_jni.h"
+#include "sky/shell/service_provider.h"
#include "sky/shell/shell.h"
#include "ui/gl/gl_surface_egl.h"
@@ -57,7 +58,8 @@ static void Init(JNIEnv* env, jclass clazz, jobject context) {
base::i18n::InitializeICU();
gfx::GLSurface::InitializeOneOff();
- Shell::Init(g_java_message_loop.Get()->task_runner());
+ Shell::Init(make_scoped_ptr(new ServiceProviderContext(
+ g_java_message_loop.Get()->task_runner())));
}
bool RegisterSkyMain(JNIEnv* env) {
« no previous file with comments | « sky/shell/android/sky_main.h ('k') | sky/shell/android/tracing_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698