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

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

Issue 22325015: Load resources from chrome.pak instead of chrome.dll on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « chrome/chrome_dll.gypi ('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_win.cc
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index ec47d4c079f9e5959acf409020806a9083770944..95b450cb11692b608a2b43944a19b5fc7797e19c 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -36,8 +36,8 @@ base::FilePath GetResourcesPakFilePath(const std::string& pak_name) {
} // namespace
void ResourceBundle::LoadCommonResources() {
- // As a convenience, add the current resource module as a data packs.
- data_packs_.push_back(new ResourceDataDLL(GetCurrentResourceDLL()));
+ AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
+ SCALE_FACTOR_NONE);
// Have high-DPI resources for 140% and 180% scaling on Windows based on
// default scaling for Metro mode. If high-DPI mode is enabled, load resource
// pak closest to the desired scale factor. The high-DPI resources are
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698