Index: ui/base/resource/resource_bundle_aurax11.cc |
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc |
index 14ffa3c0fcadb9f2e5b52b472adb542a94d0e916..52869720166bd1ede108755c4fbf0a6c00f7ebc1 100644 |
--- a/ui/base/resource/resource_bundle_aurax11.cc |
+++ b/ui/base/resource/resource_bundle_aurax11.cc |
@@ -45,41 +45,23 @@ void ResourceBundle::LoadCommonResources() { |
if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
// 1x touch |
AddDataPackFromPath(GetResourcesPakFilePath( |
- "theme_resources_touch_100_percent.pak"), |
- SCALE_FACTOR_100P); |
- AddDataPackFromPath(GetResourcesPakFilePath( |
- "ui_resources_touch_100_percent.pak"), |
+ "chrome_touch_100_percent.pak"), |
SCALE_FACTOR_100P); |
if (ShouldLoad2xResources()) { |
// 2x touch |
AddDataPackFromPath(GetResourcesPakFilePath( |
- "theme_resources_touch_200_percent.pak"), |
- SCALE_FACTOR_200P); |
- AddDataPackFromPath(GetResourcesPakFilePath( |
- "ui_resources_touch_200_percent.pak"), |
- SCALE_FACTOR_200P); |
- AddDataPackFromPath(GetResourcesPakFilePath( |
- "webkit_resources_200_percent.pak"), |
+ "chrome_touch_200_percent.pak"), |
SCALE_FACTOR_200P); |
} |
} else { |
// 1x non touch |
AddDataPackFromPath(GetResourcesPakFilePath( |
- "theme_resources_100_percent.pak"), |
- SCALE_FACTOR_100P); |
- AddDataPackFromPath(GetResourcesPakFilePath( |
- "ui_resources_100_percent.pak"), |
+ "chrome_100_percent.pak"), |
SCALE_FACTOR_100P); |
if (ShouldLoad2xResources()) { |
// 2x non touch |
AddDataPackFromPath(GetResourcesPakFilePath( |
- "theme_resources_200_percent.pak"), |
- SCALE_FACTOR_200P); |
- AddDataPackFromPath(GetResourcesPakFilePath( |
- "ui_resources_200_percent.pak"), |
- SCALE_FACTOR_200P); |
- AddDataPackFromPath(GetResourcesPakFilePath( |
- "webkit_resources_200_percent.pak"), |
+ "chrome_200_percent.pak"), |
SCALE_FACTOR_200P); |
} |
} |