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

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

Issue 2616203002: android: Remove DeviceDisplayInfo from ResourceBundle (Closed)
Patch Set: move to resource_bundle_android Created 3 years, 11 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/resource/resource_bundle_android.h ('k') | 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 (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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 JNIEnv* env = base::android::AttachCurrentThread(); 159 JNIEnv* env = base::android::AttachCurrentThread();
160 base::android::ScopedJavaLocalRef<jstring> ret = 160 base::android::ScopedJavaLocalRef<jstring> ret =
161 Java_ResourceBundle_getLocalePakResourcePath( 161 Java_ResourceBundle_getLocalePakResourcePath(
162 env, base::android::ConvertUTF8ToJavaString(env, locale)); 162 env, base::android::ConvertUTF8ToJavaString(env, locale));
163 if (ret.obj() == nullptr) { 163 if (ret.obj() == nullptr) {
164 return std::string(); 164 return std::string();
165 } 165 }
166 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); 166 return base::android::ConvertJavaStringToUTF8(env, ret.obj());
167 } 167 }
168 168
169 float GetPrimaryDisplayScale() {
170 return Java_ResourceBundle_getPrimaryDisplayScale(
171 base::android::AttachCurrentThread());
172 }
173
169 } // namespace ui 174 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698