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

Unified Diff: ui/base/resource/resource_bundle_android.cc

Issue 2235753002: Merge webviewchromium.pak and resources.pak in Monochrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« chrome/BUILD.gn ('K') | « ui/base/resource/resource_bundle_android.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_android.cc
diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc
index bec09a3b9d3b4f21b7f6a2f012e78f586e8d2a50..826231551e4a77fb169aaf6fedc76df5af1b9f57 100644
--- a/ui/base/resource/resource_bundle_android.cc
+++ b/ui/base/resource/resource_bundle_android.cc
@@ -128,7 +128,7 @@ void SetLocalePaksStoredInApk(bool value) {
g_locale_paks_in_apk = value;
}
-void LoadMainAndroidPackFile(const char* path_within_apk,
+bool LoadMainAndroidPackFile(const char* path_within_apk,
const base::FilePath& disk_file_path) {
if (LoadFromApkOrFile(path_within_apk,
&disk_file_path,
@@ -137,7 +137,9 @@ void LoadMainAndroidPackFile(const char* path_within_apk,
ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
base::File(g_resources_pack_fd), g_resources_pack_region,
SCALE_FACTOR_NONE);
+ return true;
}
+ return false;
}
int GetMainAndroidPackFd(base::MemoryMappedFile::Region* out_region) {
« chrome/BUILD.gn ('K') | « 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