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

Unified Diff: ui/base/resource/resource_bundle_ios.mm

Issue 537063002: Eliminate silently letting errors pass on pak loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ios finally works Created 6 years, 3 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
Index: ui/base/resource/resource_bundle_ios.mm
diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm
index 4f5d9bc34fd85620a1a2c9f89b6ef286a61c221c..832656dea569ef2947690f5f8791d294e433f7b8 100644
--- a/ui/base/resource/resource_bundle_ios.mm
+++ b/ui/base/resource/resource_bundle_ios.mm
@@ -34,9 +34,16 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
resource_path = [base::mac::FrameworkBundle() pathForResource:name
ofType:@"pak"];
}
+
if (!resource_path) {
- // Return just the name of the pak file.
- return base::FilePath(base::SysNSStringToUTF8(name) + ".pak");
+ // Trying to load a resources file that doesn't exist is an error. Return
+ // just the name of the pack file so that further down the line it is easier
+ // to track down what happened.
+ std::string name_string = base::SysNSStringToUTF8(name);
+ std::string locale_string = base::SysNSStringToUTF8(mac_locale);
+ LOG(ERROR) << "Tried to get the file path of a non-existent pak file '"
+ << name_string << "' for locale '" << locale_string << "'";
+ return base::FilePath(name_string + ".pak");
}
return base::FilePath([resource_path fileSystemRepresentation]);
}
@@ -44,9 +51,6 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
} // namespace
void ResourceBundle::LoadCommonResources() {
- AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
- ui::SCALE_FACTOR_NONE);
-
if (IsScaleFactorSupported(SCALE_FACTOR_100P)) {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent", nil),
SCALE_FACTOR_100P);

Powered by Google App Engine
This is Rietveld 408576698