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

Unified Diff: sky/shell/library_loader.cc

Issue 936883002: Connect Sky and Ganesh in SkyShell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Address review comments Created 5 years, 10 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/java_service_provider.cc ('k') | sky/shell/platform_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/shell/library_loader.cc
diff --git a/sky/shell/library_loader.cc b/sky/shell/library_loader.cc
index 1682167f95e49b6bc1088ae82fa8f6c96c6de74c..971c861ca82f72d6d07bbb3e3871370e51311191 100644
--- a/sky/shell/library_loader.cc
+++ b/sky/shell/library_loader.cc
@@ -7,14 +7,18 @@
#include "base/android/jni_registrar.h"
#include "base/android/library_loader/library_loader_hooks.h"
#include "base/logging.h"
+#include "mojo/android/system/core_impl.h"
+#include "sky/shell/java_service_provider.h"
+#include "sky/shell/platform_view.h"
#include "sky/shell/sky_main.h"
-#include "sky/shell/sky_view.h"
namespace {
base::android::RegistrationMethod kSkyRegisteredMethods[] = {
+ {"CoreImpl", mojo::android::RegisterCoreImpl},
+ {"JavaServiceProvider", sky::shell::RegisterJavaServiceProvider},
{"SkyMain", sky::shell::RegisterSkyMain},
- {"SkyView", sky::shell::SkyView::Register},
+ {"PlatformView", sky::shell::PlatformView::Register},
};
bool RegisterSkyJni(JNIEnv* env) {
« no previous file with comments | « sky/shell/java_service_provider.cc ('k') | sky/shell/platform_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698