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

Unified Diff: app/resource_bundle_linux.cc

Issue 338028: ResourceBundle::GetRawDataResource should fall back to localized resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 2 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
« no previous file with comments | « no previous file | app/resource_bundle_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/resource_bundle_linux.cc
===================================================================
--- app/resource_bundle_linux.cc (revision 30078)
+++ app/resource_bundle_linux.cc (working copy)
@@ -132,8 +132,13 @@
base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
DCHECK(resources_data_);
base::StringPiece data;
- if (!resources_data_->Get(resource_id, &data))
- return base::StringPiece();
+
+ if (!resources_data_->Get(resource_id, &data)) {
+ if (!locale_resources_data_->Get(resource_id, &data)) {
+ return base::StringPiece();
+ }
+ }
+
return data;
}
« no previous file with comments | « no previous file | app/resource_bundle_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698