| 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 826231551e4a77fb169aaf6fedc76df5af1b9f57..bec09a3b9d3b4f21b7f6a2f012e78f586e8d2a50 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;
|
| }
|
|
|
| -bool LoadMainAndroidPackFile(const char* path_within_apk,
|
| +void LoadMainAndroidPackFile(const char* path_within_apk,
|
| const base::FilePath& disk_file_path) {
|
| if (LoadFromApkOrFile(path_within_apk,
|
| &disk_file_path,
|
| @@ -137,9 +137,7 @@ bool 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) {
|
|
|