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

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

Issue 1131523007: Move NativeViewport service into view_manager. This is a file move only. Further merging will happe… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 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 | « mojo/runner/DEPS ('k') | mojo/runner/android/native_viewport_application_loader.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 "components/native_viewport/platform_viewport_android.h" 10 #include "components/view_manager/native_viewport/platform_viewport_android.h"
11 #include "mojo/runner/android/android_handler.h" 11 #include "mojo/runner/android/android_handler.h"
12 #include "mojo/runner/android/main.h" 12 #include "mojo/runner/android/main.h"
13 13
14 namespace { 14 namespace {
15 15
16 base::android::RegistrationMethod kMojoRegisteredMethods[] = { 16 base::android::RegistrationMethod kMojoRegisteredMethods[] = {
17 {"AndroidHandler", mojo::runner::RegisterAndroidHandlerJni}, 17 {"AndroidHandler", mojo::runner::RegisterAndroidHandlerJni},
18 {"PlatformViewportAndroid", 18 {"PlatformViewportAndroid",
19 native_viewport::PlatformViewportAndroid::Register}, 19 native_viewport::PlatformViewportAndroid::Register},
20 {"ShellMain", mojo::runner::RegisterShellMain}, 20 {"ShellMain", mojo::runner::RegisterShellMain},
(...skipping 14 matching lines...) Expand all
35 std::vector<base::android::RegisterCallback> register_callbacks; 35 std::vector<base::android::RegisterCallback> register_callbacks;
36 register_callbacks.push_back(base::Bind(&RegisterJNI)); 36 register_callbacks.push_back(base::Bind(&RegisterJNI));
37 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 37 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
38 !base::android::OnJNIOnLoadInit( 38 !base::android::OnJNIOnLoadInit(
39 std::vector<base::android::InitCallback>())) { 39 std::vector<base::android::InitCallback>())) {
40 return -1; 40 return -1;
41 } 41 }
42 42
43 return JNI_VERSION_1_4; 43 return JNI_VERSION_1_4;
44 } 44 }
OLDNEW
« no previous file with comments | « mojo/runner/DEPS ('k') | mojo/runner/android/native_viewport_application_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698