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

Side by Side Diff: ui/base/resource/resource_bundle_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 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
« no previous file with comments | « ui/base/l10n/l10n_util_android.cc ('k') | ui/events/android/key_event_utils.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 "ui/base/resource/resource_bundle_android.h" 5 #include "ui/base/resource/resource_bundle_android.h"
6 6
7 #include "base/android/apk_assets.h" 7 #include "base/android/apk_assets.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 int GetLocalePackFd(base::MemoryMappedFile::Region* out_region) { 155 int GetLocalePackFd(base::MemoryMappedFile::Region* out_region) {
156 DCHECK_GE(g_locale_pack_fd, 0); 156 DCHECK_GE(g_locale_pack_fd, 0);
157 *out_region = g_locale_pack_region; 157 *out_region = g_locale_pack_region;
158 return g_locale_pack_fd; 158 return g_locale_pack_fd;
159 } 159 }
160 160
161 std::string GetPathForAndroidLocalePakWithinApk(const std::string& locale) { 161 std::string GetPathForAndroidLocalePakWithinApk(const std::string& locale) {
162 JNIEnv* env = base::android::AttachCurrentThread(); 162 JNIEnv* env = base::android::AttachCurrentThread();
163 base::android::ScopedJavaLocalRef<jstring> ret = 163 base::android::ScopedJavaLocalRef<jstring> ret =
164 Java_ResourceBundle_getLocalePakResourcePath( 164 Java_ResourceBundle_getLocalePakResourcePath(
165 env, base::android::ConvertUTF8ToJavaString(env, locale).obj()); 165 env, base::android::ConvertUTF8ToJavaString(env, locale));
166 if (ret.obj() == nullptr) { 166 if (ret.obj() == nullptr) {
167 return std::string(); 167 return std::string();
168 } 168 }
169 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); 169 return base::android::ConvertJavaStringToUTF8(env, ret.obj());
170 } 170 }
171 171
172 } // namespace ui 172 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/l10n/l10n_util_android.cc ('k') | ui/events/android/key_event_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698