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

Unified Diff: sky/shell/library_loader.cc

Issue 893643002: Add a standalone SkyShell.apk for testing (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
Index: sky/shell/library_loader.cc
diff --git a/shell/android/library_loader.cc b/sky/shell/library_loader.cc
similarity index 54%
copy from shell/android/library_loader.cc
copy to sky/shell/library_loader.cc
index 42e02dff86490341d5964dfeeaebd2818455407f..9eb74b1843d2dfb409c87030dce251f4f8737c6e 100644
--- a/shell/android/library_loader.cc
+++ b/sky/shell/library_loader.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,24 +7,17 @@
#include "base/android/jni_registrar.h"
#include "base/android/library_loader/library_loader_hooks.h"
#include "base/logging.h"
-#include "services/native_viewport/platform_viewport_android.h"
-#include "shell/android/android_handler.h"
-#include "shell/android/keyboard_impl.h"
-#include "shell/android/mojo_main.h"
+#include "sky/shell/sky_main.h"
namespace {
-base::android::RegistrationMethod kMojoRegisteredMethods[] = {
- {"AndroidHandler", mojo::RegisterAndroidHandlerJni},
- {"Keyboard", mojo::shell::RegisterKeyboardJni},
- {"MojoMain", mojo::shell::RegisterMojoMain},
- {"PlatformViewportAndroid",
- native_viewport::PlatformViewportAndroid::Register},
+base::android::RegistrationMethod kSkyRegisteredMethods[] = {
+ {"SkyMain", sky::shell::RegisterSkyMain},
};
bool RegisterMojoJni(JNIEnv* env) {
- return RegisterNativeMethods(env, kMojoRegisteredMethods,
- arraysize(kMojoRegisteredMethods));
+ return RegisterNativeMethods(env, kSkyRegisteredMethods,
+ arraysize(kSkyRegisteredMethods));
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698