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

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

Issue 419093002: ui: Remove ResourceBundle::LoadCommonResources(). Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: InitParams changes Created 6 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 | « ui/base/resource/resource_bundle_mac.mm ('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 fa17eee50316d09eb2242857b7ef49377d00f13f..f8350735f4faa892fdc562af79c82b8843baebff 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -28,34 +28,8 @@ HINSTANCE GetCurrentResourceDLL() {
return GetModuleHandle(NULL);
}
-base::FilePath GetResourcesPakFilePath(const std::string& pak_name) {
- base::FilePath path;
- if (PathService::Get(base::DIR_MODULE, &path))
- return path.AppendASCII(pak_name.c_str());
-
- // Return just the name of the pack file.
- return base::FilePath(base::ASCIIToUTF16(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()));
-
- if (IsScaleFactorSupported(SCALE_FACTOR_100P)) {
- AddDataPackFromPath(
- GetResourcesPakFilePath("chrome_100_percent.pak"),
- SCALE_FACTOR_100P);
- }
- if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
- DCHECK(gfx::IsHighDPIEnabled());
- AddDataPackFromPath(
- GetResourcesPakFilePath("chrome_200_percent.pak"),
- SCALE_FACTOR_200P);
- }
-}
-
gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
// Flipped image is not used on Windows.
DCHECK_EQ(rtl, RTL_DISABLED);
« no previous file with comments | « ui/base/resource/resource_bundle_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698