cros: Use touch theme assets with --touch-optimized-ui

ui/base/resource/resource_bundle_aurax11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/resource/resource_bundle.h"
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_handle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 FilePath GetResourcesPakFilePath(const std::string& pak_name) {
   FilePath path;
   if (PathService::Get(base::DIR_MODULE, &path))
     return path.AppendASCII(pak_name.c_str());
   return FilePath();
 }
 
 }  // namespace
 
 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);
   }
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Flipped image is not used on ChromeOS.
   DCHECK_EQ(rtl, RTL_DISABLED);
   return GetImageNamed(resource_id);
 }
 
 }  // namespace ui