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

BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.

Review URL: https://chromiumcodereview.appspot.com/10825111

TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10827225

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150570 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 11 insertions, 47 deletions

diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc
index 575bda3..dc43957 100644
--- a/ui/base/resource/resource_bundle_android.cc
+++ b/ui/base/resource/resource_bundle_android.cc
@@ -21,9 +21,7 @@ void ResourceBundle::LoadCommonResources() {
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path);
   AddDataPackFromPath(path.AppendASCII("chrome.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(path.AppendASCII("theme_resources_100_percent.pak"),
-                      SCALE_FACTOR_100P);
-  AddDataPackFromPath(path.AppendASCII("ui_resources_100_percent.pak"),
+  AddDataPackFromPath(path.AppendASCII("chrome_100_percent.pak"),
                       SCALE_FACTOR_100P);
 }
 
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
index 14ffa3c..5286972 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);
     }
   }
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc
index 628ad48..1d5d1e3 100644
--- a/ui/base/resource/resource_bundle_gtk.cc
+++ b/ui/base/resource/resource_bundle_gtk.cc
@@ -68,10 +68,7 @@ void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
                       SCALE_FACTOR_100P);
   AddDataPackFromPath(GetResourcesPakFilePath(
-                      "theme_resources_100_percent.pak"),
-                      SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(
-                      "ui_resources_100_percent.pak"),
+                      "chrome_100_percent.pak"),
                       SCALE_FACTOR_100P);
 }
 
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index bafd94f..0a3f7ffa 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -51,9 +51,7 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_100_percent",
-                        nil), SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_100_percent",
+  AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
                         nil), SCALE_FACTOR_100P);
   AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
                         nil), SCALE_FACTOR_100P);
@@ -62,9 +60,7 @@ void ResourceBundle::LoadCommonResources() {
   // On Mac we load both and let the UI framework decide which one to use.
 #if defined(ENABLE_HIDPI)
   if (base::mac::IsOSLionOrLater()) {
-    AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_200_percent",
-                          nil), SCALE_FACTOR_200P);
-    AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
+    AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent",
                           nil), SCALE_FACTOR_200P);
     AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_200_percent",
                           nil), SCALE_FACTOR_200P);
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index cb2287a..0f6092d 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -49,29 +49,20 @@ void ResourceBundle::LoadCommonResources() {
   switch (ui::GetDisplayLayout()) {
     case ui::LAYOUT_TOUCH:
       AddDataPackFromPath(
-          GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"),
-          SCALE_FACTOR_100P);
-      AddDataPackFromPath(
-          GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+          GetResourcesPakFilePath("chrome_touch_100_percent.pak"),
           SCALE_FACTOR_100P);
       break;
     default:
       if (use_hidpi) {
         AddDataPackFromPath(GetResourcesPakFilePath(
-                            "theme_resources_200_percent.pak"),
-                            SCALE_FACTOR_200P);
-        AddDataPackFromPath(GetResourcesPakFilePath(
-                            "ui_resources_200_percent.pak"),
+                            "chrome_200_percent.pak"),
                             SCALE_FACTOR_200P);
         AddDataPackFromPath(GetResourcesPakFilePath(
                             "webkit_resources_200_percent.pak"),
                             SCALE_FACTOR_200P);
       } else {
         AddDataPackFromPath(
-            GetResourcesPakFilePath("theme_resources_100_percent.pak"),
-            SCALE_FACTOR_100P);
-        AddDataPackFromPath(
-            GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+            GetResourcesPakFilePath("chrome_100_percent.pak"),
             SCALE_FACTOR_100P);
       }
       break;