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 |