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

Side by Side Diff: content/common/android/device_info.cc

Issue 10798010: Uses gyp "rules" rather than "actions" templates for the JNI generator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Typo on content_jni.gypi Created 8 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « content/common/android/command_line.cc ('k') | content/common/android/surface_callback.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/common/android/device_info.h" 5 #include "content/common/android/device_info.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "jni/device_info_jni.h" 10 #include "jni/DeviceInfo_jni.h"
11 11
12 using base::android::AttachCurrentThread; 12 using base::android::AttachCurrentThread;
13 using base::android::ConvertJavaStringToUTF8; 13 using base::android::ConvertJavaStringToUTF8;
14 using base::android::ScopedJavaLocalRef; 14 using base::android::ScopedJavaLocalRef;
15 15
16 namespace content { 16 namespace content {
17 17
18 DeviceInfo::DeviceInfo() { 18 DeviceInfo::DeviceInfo() {
19 JNIEnv* env = AttachCurrentThread(); 19 JNIEnv* env = AttachCurrentThread();
20 j_device_info_.Reset(Java_DeviceInfo_create(env, 20 j_device_info_.Reset(Java_DeviceInfo_create(env,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 ScopedJavaLocalRef<jstring> result = 71 ScopedJavaLocalRef<jstring> result =
72 Java_DeviceInfo_getNetworkCountryIso(env, j_device_info_.obj()); 72 Java_DeviceInfo_getNetworkCountryIso(env, j_device_info_.obj());
73 return ConvertJavaStringToUTF8(result); 73 return ConvertJavaStringToUTF8(result);
74 } 74 }
75 75
76 bool RegisterDeviceInfo(JNIEnv* env) { 76 bool RegisterDeviceInfo(JNIEnv* env) {
77 return RegisterNativesImpl(env); 77 return RegisterNativesImpl(env);
78 } 78 }
79 79
80 } // namespace content 80 } // namespace content
OLDNEW
« no previous file with comments | « content/common/android/command_line.cc ('k') | content/common/android/surface_callback.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698