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

Side by Side Diff: base/android/library_loader/library_loader_hooks.cc

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/library_loader/library_loader_hooks.h" 5 #include "base/android/library_loader/library_loader_hooks.h"
6 6
7 #include "base/android/command_line_android.h" 7 #include "base/android/command_line_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/android/library_loader/library_load_from_apk_status_codes.h" 9 #include "base/android/library_loader/library_load_from_apk_status_codes.h"
10 #include "base/android/library_loader/library_prefetcher.h" 10 #include "base/android/library_loader/library_prefetcher.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 } 145 }
146 146
147 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { 147 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
148 return RegisterNativesImpl(env); 148 return RegisterNativesImpl(env);
149 } 149 }
150 150
151 void SetVersionNumber(const char* version_number) { 151 void SetVersionNumber(const char* version_number) {
152 g_library_version_number = strdup(version_number); 152 g_library_version_number = strdup(version_number);
153 } 153 }
154 154
155 ScopedJavaLocalRef<jstring> GetVersionNumber(JNIEnv* env, jobject jcaller) { 155 jstring GetVersionNumber(JNIEnv* env, jobject jcaller) {
156 return ConvertUTF8ToJavaString(env, g_library_version_number); 156 return ConvertUTF8ToJavaString(env, g_library_version_number).Release();
157 } 157 }
158 158
159 LibraryProcessType GetLibraryProcessType(JNIEnv* env) { 159 LibraryProcessType GetLibraryProcessType(JNIEnv* env) {
160 return static_cast<LibraryProcessType>( 160 return static_cast<LibraryProcessType>(
161 Java_LibraryLoader_getLibraryProcessType(env)); 161 Java_LibraryLoader_getLibraryProcessType(env));
162 } 162 }
163 163
164 void InitAtExitManager() { 164 void InitAtExitManager() {
165 g_at_exit_manager = new base::AtExitManager(); 165 g_at_exit_manager = new base::AtExitManager();
166 } 166 }
167 167
168 } // namespace android 168 } // namespace android
169 } // namespace base 169 } // namespace base
OLDNEW
« no previous file with comments | « base/android/jni_generator/testNatives.golden ('k') | chrome/browser/android/chrome_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698