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

Unified Diff: chrome/common/resource_bundle.cc

Issue 6804: Add about:terms to Chrome, and about:licence to Chromium and Chrome. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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 | « chrome/chrome_kjs.sln ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/resource_bundle.cc
===================================================================
--- chrome/common/resource_bundle.cc (revision 3215)
+++ chrome/common/resource_bundle.cc (working copy)
@@ -217,12 +217,20 @@
StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
void* data_ptr;
size_t data_size;
- if (base::GetDataResourceFromModule(
- _AtlBaseModule.GetModuleInstance(), resource_id, &data_ptr, &data_size))
+ if (base::GetDataResourceFromModule(_AtlBaseModule.GetModuleInstance(),
+ resource_id,
+ &data_ptr,
+ &data_size)) {
return StringPiece(static_cast<const char*>(data_ptr), data_size);
+ } else if (locale_resources_dll_ &&
+ base::GetDataResourceFromModule(locale_resources_dll_,
+ resource_id,
+ &data_ptr,
+ &data_size)) {
+ return StringPiece(static_cast<const char*>(data_ptr), data_size);
+ }
return StringPiece();
}
-
// Loads and returns the global accelerators from the current module.
HACCEL ResourceBundle::GetGlobalAccelerators() {
return ::LoadAccelerators(_AtlBaseModule.GetModuleInstance(),
« no previous file with comments | « chrome/chrome_kjs.sln ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698