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

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

Issue 2248743002: Fix missing monochrome resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rethink: change webview resource files to match chrome 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/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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 } 121 }
122 122
123 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { 123 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
124 return GetImageNamed(resource_id); 124 return GetImageNamed(resource_id);
125 } 125 }
126 126
127 void SetLocalePaksStoredInApk(bool value) { 127 void SetLocalePaksStoredInApk(bool value) {
128 g_locale_paks_in_apk = value; 128 g_locale_paks_in_apk = value;
129 } 129 }
130 130
131 bool LoadMainAndroidPackFile(const char* path_within_apk, 131 void LoadMainAndroidPackFile(const char* path_within_apk,
132 const base::FilePath& disk_file_path) { 132 const base::FilePath& disk_file_path) {
133 if (LoadFromApkOrFile(path_within_apk, 133 if (LoadFromApkOrFile(path_within_apk,
134 &disk_file_path, 134 &disk_file_path,
135 &g_resources_pack_fd, 135 &g_resources_pack_fd,
136 &g_resources_pack_region)) { 136 &g_resources_pack_region)) {
137 ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion( 137 ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
138 base::File(g_resources_pack_fd), g_resources_pack_region, 138 base::File(g_resources_pack_fd), g_resources_pack_region,
139 SCALE_FACTOR_NONE); 139 SCALE_FACTOR_NONE);
140 return true;
141 } 140 }
142 return false;
143 } 141 }
144 142
145 int GetMainAndroidPackFd(base::MemoryMappedFile::Region* out_region) { 143 int GetMainAndroidPackFd(base::MemoryMappedFile::Region* out_region) {
146 DCHECK_GE(g_resources_pack_fd, 0); 144 DCHECK_GE(g_resources_pack_fd, 0);
147 *out_region = g_resources_pack_region; 145 *out_region = g_resources_pack_region;
148 return g_resources_pack_fd; 146 return g_resources_pack_fd;
149 } 147 }
150 148
151 int GetCommonResourcesPackFd(base::MemoryMappedFile::Region* out_region) { 149 int GetCommonResourcesPackFd(base::MemoryMappedFile::Region* out_region) {
152 DCHECK_GE(g_chrome_100_percent_fd, 0); 150 DCHECK_GE(g_chrome_100_percent_fd, 0);
(...skipping 12 matching lines...) Expand all
165 base::android::ScopedJavaLocalRef<jstring> ret = 163 base::android::ScopedJavaLocalRef<jstring> ret =
166 Java_ResourceBundle_getLocalePakResourcePath( 164 Java_ResourceBundle_getLocalePakResourcePath(
167 env, base::android::ConvertUTF8ToJavaString(env, locale).obj()); 165 env, base::android::ConvertUTF8ToJavaString(env, locale).obj());
168 if (ret.obj() == nullptr) { 166 if (ret.obj() == nullptr) {
169 return std::string(); 167 return std::string();
170 } 168 }
171 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); 169 return base::android::ConvertJavaStringToUTF8(env, ret.obj());
172 } 170 }
173 171
174 } // namespace ui 172 } // 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