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

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

Issue 10320002: cros: Use touch theme assets with --touch-optimized-ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 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
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 76152eadae945ab60567b8aeacf3b2be2407b1f8..9dd313779f03aafe1a34c5e17dec95b1c7c29539 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -27,13 +27,15 @@ namespace ui {
void ResourceBundle::LoadCommonResources() {
AddDataPack(GetResourcesPakFilePath("chrome.pak"),
ResourceHandle::kScaleFactor100x);
- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
- ResourceHandle::kScaleFactor100x);
if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
+ AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
+ ResourceHandle::kScaleFactor100x);
AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),
ResourceHandle::kScaleFactor100x);
} else {
+ AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
+ ResourceHandle::kScaleFactor100x);
AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
ResourceHandle::kScaleFactor100x);
}

Powered by Google App Engine
This is Rietveld 408576698