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 df058e6ef59d94d16c71c346c059fa7e8408f18c..3938722df96e731ab21fae491b19edda83655efa 100644 |
--- a/ui/base/resource/resource_bundle_win.cc |
+++ b/ui/base/resource/resource_bundle_win.cc |
@@ -38,36 +38,9 @@ base::FilePath GetResourcesPakFilePath(const std::string& pak_name) { |
void ResourceBundle::LoadCommonResources() { |
// As a convenience, add the current resource module as a data packs. |
data_packs_.push_back(new ResourceDataDLL(GetCurrentResourceDLL())); |
- // 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 |
- // scaled up from 100% touch. |
- float scale = gfx::win::GetDeviceScaleFactor(); |
- bool force_touch_resources = false; |
- switch(ui::GetSupportedScaleFactor(scale)) { |
- case ui::SCALE_FACTOR_180P: |
- AddDataPackFromPath(GetResourcesPakFilePath( |
- "chrome_touch_180_percent.pak"), |
- SCALE_FACTOR_180P); |
- force_touch_resources = true; |
- break; |
- case ui::SCALE_FACTOR_140P: |
- AddDataPackFromPath(GetResourcesPakFilePath( |
- "chrome_touch_140_percent.pak"), |
- SCALE_FACTOR_140P); |
- force_touch_resources = true; |
- } |
- // TODO(kevers|girard): Remove loading of 1x resources when in high-DPI |
- // mode once all resources are available at 140% and 180%. |
- if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH || force_touch_resources) { |
- AddDataPackFromPath( |
- GetResourcesPakFilePath("chrome_touch_100_percent.pak"), |
- SCALE_FACTOR_100P); |
- } else { |
- AddDataPackFromPath( |
- GetResourcesPakFilePath("chrome_100_percent.pak"), |
- SCALE_FACTOR_100P); |
- } |
+ AddDataPackFromPath( |
+ GetResourcesPakFilePath("chrome_100_percent.pak"), |
+ SCALE_FACTOR_100P); |
} |
gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { |