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

Side by Side Diff: shell/android/library_loader.cc

Issue 1045923003: Rename the various shell MojoMains to ShellMain. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « shell/android/apk/src/org/chromium/mojo/shell/ShellMain.java ('k') | shell/android/main.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/android/base_jni_onload.h" 5 #include "base/android/base_jni_onload.h"
6 #include "base/android/base_jni_registrar.h" 6 #include "base/android/base_jni_registrar.h"
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "services/native_viewport/platform_viewport_android.h" 10 #include "services/native_viewport/platform_viewport_android.h"
11 #include "shell/android/android_handler.h" 11 #include "shell/android/android_handler.h"
12 #include "shell/android/keyboard_impl.h" 12 #include "shell/android/keyboard_impl.h"
13 #include "shell/android/main.h" 13 #include "shell/android/main.h"
14 14
15 namespace { 15 namespace {
16 16
17 base::android::RegistrationMethod kMojoRegisteredMethods[] = { 17 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
18 {"AndroidHandler", mojo::shell::RegisterAndroidHandlerJni}, 18 {"AndroidHandler", mojo::shell::RegisterAndroidHandlerJni},
19 {"Keyboard", mojo::shell::RegisterKeyboardJni}, 19 {"Keyboard", mojo::shell::RegisterKeyboardJni},
20 {"MojoMain", mojo::shell::RegisterMojoMain},
21 {"PlatformViewportAndroid", 20 {"PlatformViewportAndroid",
22 native_viewport::PlatformViewportAndroid::Register}, 21 native_viewport::PlatformViewportAndroid::Register},
22 {"ShellMain", mojo::shell::RegisterShellMain},
23 }; 23 };
24 24
25 bool RegisterJNI(JNIEnv* env) { 25 bool RegisterJNI(JNIEnv* env) {
26 if (!base::android::RegisterJni(env)) 26 if (!base::android::RegisterJni(env))
27 return false; 27 return false;
28 28
29 return RegisterNativeMethods(env, kMojoRegisteredMethods, 29 return RegisterNativeMethods(env, kMojoRegisteredMethods,
30 arraysize(kMojoRegisteredMethods)); 30 arraysize(kMojoRegisteredMethods));
31 } 31 }
32 32
33 } // namespace 33 } // namespace
34 34
35 // This is called by the VM when the shared library is first loaded. 35 // This is called by the VM when the shared library is first loaded.
36 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 36 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
37 std::vector<base::android::RegisterCallback> register_callbacks; 37 std::vector<base::android::RegisterCallback> register_callbacks;
38 register_callbacks.push_back(base::Bind(&RegisterJNI)); 38 register_callbacks.push_back(base::Bind(&RegisterJNI));
39 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 39 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
40 !base::android::OnJNIOnLoadInit( 40 !base::android::OnJNIOnLoadInit(
41 std::vector<base::android::InitCallback>())) { 41 std::vector<base::android::InitCallback>())) {
42 return -1; 42 return -1;
43 } 43 }
44 44
45 return JNI_VERSION_1_4; 45 return JNI_VERSION_1_4;
46 } 46 }
OLDNEW
« no previous file with comments | « shell/android/apk/src/org/chromium/mojo/shell/ShellMain.java ('k') | shell/android/main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698