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

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

Issue 769173002: Move native_viewport and gles2 service impls to //services (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « mojo/shell/BUILD.gn ('k') | mojo/shell/context.cc » ('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_registrar.h" 5 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "base/android/jni_registrar.h" 7 #include "base/android/jni_registrar.h"
8 #include "base/android/library_loader/library_loader_hooks.h" 8 #include "base/android/library_loader/library_loader_hooks.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "mojo/services/native_viewport/platform_viewport_android.h"
11 #include "mojo/shell/android/android_handler.h" 10 #include "mojo/shell/android/android_handler.h"
12 #include "mojo/shell/android/mojo_main.h" 11 #include "mojo/shell/android/mojo_main.h"
13 #include "net/android/net_jni_registrar.h" 12 #include "net/android/net_jni_registrar.h"
13 #include "services/native_viewport/platform_viewport_android.h"
14 14
15 namespace { 15 namespace {
16 16
17 base::android::RegistrationMethod kMojoRegisteredMethods[] = { 17 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
18 {"AndroidHandler", mojo::RegisterAndroidHandlerJni}, 18 {"AndroidHandler", mojo::RegisterAndroidHandlerJni},
19 {"MojoMain", mojo::RegisterMojoMain}, 19 {"MojoMain", mojo::RegisterMojoMain},
20 {"PlatformViewportAndroid", mojo::PlatformViewportAndroid::Register}, 20 {"PlatformViewportAndroid", mojo::PlatformViewportAndroid::Register},
21 }; 21 };
22 22
23 bool RegisterMojoJni(JNIEnv* env) { 23 bool RegisterMojoJni(JNIEnv* env) {
(...skipping 18 matching lines...) Expand all
42 return -1; 42 return -1;
43 43
44 if (!RegisterMojoJni(env)) 44 if (!RegisterMojoJni(env))
45 return -1; 45 return -1;
46 46
47 if (!mojo::RegisterAndroidHandlerJni(env)) 47 if (!mojo::RegisterAndroidHandlerJni(env))
48 return -1; 48 return -1;
49 49
50 return JNI_VERSION_1_4; 50 return JNI_VERSION_1_4;
51 } 51 }
OLDNEW
« no previous file with comments | « mojo/shell/BUILD.gn ('k') | mojo/shell/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698