Revert 150411 - Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files.

ui/base/resource/resource_bundle_aurax11.cc

Index: ui/base/resource/resource_bundle_aurax11.cc
===================================================================
--- ui/base/resource/resource_bundle_aurax11.cc	(revision 150448)
+++ ui/base/resource/resource_bundle_aurax11.cc	(working copy)
@@ -45,24 +45,42 @@
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     // 1x touch
     AddDataPackFromPath(GetResourcesPakFilePath(
-                        "chrome_touch_100_percent.pak"),
+                        "theme_resources_touch_100_percent.pak"),
                         SCALE_FACTOR_100P);
+    AddDataPackFromPath(GetResourcesPakFilePath(
+                        "ui_resources_touch_100_percent.pak"),
+                        SCALE_FACTOR_100P);
     if (ShouldLoad2xResources()) {
       // 2x touch
       AddDataPackFromPath(GetResourcesPakFilePath(
-                          "chrome_touch_200_percent.pak"),
+                          "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"),
+                          SCALE_FACTOR_200P);
     }
   } else {
     // 1x non touch
     AddDataPackFromPath(GetResourcesPakFilePath(
-                        "chrome_100_percent.pak"),
+                        "theme_resources_100_percent.pak"),
                         SCALE_FACTOR_100P);
+    AddDataPackFromPath(GetResourcesPakFilePath(
+                        "ui_resources_100_percent.pak"),
+                        SCALE_FACTOR_100P);
     if (ShouldLoad2xResources()) {
       // 2x non touch
       AddDataPackFromPath(GetResourcesPakFilePath(
-                          "chrome_200_percent.pak"),
+                          "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"),
+                          SCALE_FACTOR_200P);
     }
   }
 }