| 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);
|
|
|