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

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

Issue 806873002: Do not register AndroidHandler's native methods eagerly. (Closed) Base URL: https://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 | « no previous file | no next file » | 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 "services/native_viewport/platform_viewport_android.h" 10 #include "services/native_viewport/platform_viewport_android.h"
(...skipping 23 matching lines...) Expand all
34 34
35 if (!base::android::RegisterLibraryLoaderEntryHook(env)) 35 if (!base::android::RegisterLibraryLoaderEntryHook(env))
36 return -1; 36 return -1;
37 37
38 if (!base::android::RegisterJni(env)) 38 if (!base::android::RegisterJni(env))
39 return -1; 39 return -1;
40 40
41 if (!RegisterMojoJni(env)) 41 if (!RegisterMojoJni(env))
42 return -1; 42 return -1;
43 43
44 if (!mojo::RegisterAndroidHandlerJni(env))
45 return -1;
46
47 return JNI_VERSION_1_4; 44 return JNI_VERSION_1_4;
48 } 45 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698