Revert 147288 - Renamed resource files to be more verbose, specifically:

[ui,theme]_resources_standard.[pak,rc] changed to .._resources_100_percent..
and likewise
[ui,theme]_resources_2x.pak changed to .._resources_200_percent.pak

BUG=120185
TEST=run chome,ash_shell confirm assets loaded


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

TBR=harrym@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10806018

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

5 files changed, 19 insertions, 32 deletions

diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc
index 141d3af..d5f7316 100644
--- a/ui/base/resource/resource_bundle_android.cc
+++ b/ui/base/resource/resource_bundle_android.cc
@@ -31,11 +31,9 @@ namespace ui {
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(
-                      "theme_resources_100_percent.pak"),
+  AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(
-                      "ui_resources_100_percent.pak"),
+  AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
                       SCALE_FACTOR_100P);
 }
 
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
index f443e57..bdb6fcc 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -44,36 +44,29 @@ void ResourceBundle::LoadCommonResources() {
 
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     // 1x touch
-    AddDataPackFromPath(GetResourcesPakFilePath(
-                        "theme_resources_touch_100_percent.pak"),
+    AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
                         SCALE_FACTOR_100P);
-    AddDataPackFromPath(GetResourcesPakFilePath(
-                        "ui_resources_touch_100_percent.pak"),
+    AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch.pak"),
                         SCALE_FACTOR_100P);
     if (ShouldLoad2xResources()) {
       // 2x touch
       AddDataPackFromPath(
-          GetResourcesPakFilePath("theme_resources_touch_200_percent.pak"),
+          GetResourcesPakFilePath("theme_resources_touch_2x.pak"),
           SCALE_FACTOR_200P);
-      AddDataPackFromPath(GetResourcesPakFilePath(
-                          "ui_resources_touch_200_percent.pak"),
+      AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch_2x.pak"),
                           SCALE_FACTOR_200P);
     }
   } else {
     // 1x non touch
-    AddDataPackFromPath(GetResourcesPakFilePath(
-                        "theme_resources_100_percent.pak"),
+    AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
                         SCALE_FACTOR_100P);
-    AddDataPackFromPath(GetResourcesPakFilePath(
-                        "ui_resources_100_percent.pak"),
+    AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
                         SCALE_FACTOR_100P);
     if (ShouldLoad2xResources()) {
       // 2x non touch
-      AddDataPackFromPath(GetResourcesPakFilePath(
-                          "theme_resources_200_percent.pak"),
+      AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
                           SCALE_FACTOR_200P);
-      AddDataPackFromPath(GetResourcesPakFilePath(
-                          "ui_resources_200_percent.pak"),
+      AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
                           SCALE_FACTOR_200P);
     }
   }
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc
index 628ad48..2b90f5b 100644
--- a/ui/base/resource/resource_bundle_gtk.cc
+++ b/ui/base/resource/resource_bundle_gtk.cc
@@ -67,11 +67,9 @@ FilePath GetResourcesPakFilePath(const std::string& pak_name) {
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(
-                      "theme_resources_100_percent.pak"),
+  AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(
-                      "ui_resources_100_percent.pak"),
+  AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
                       SCALE_FACTOR_100P);
 }
 
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index bba84d4..7ef486a 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -49,26 +49,24 @@ void ResourceBundle::LoadCommonResources() {
   switch (ui::GetDisplayLayout()) {
     case ui::LAYOUT_TOUCH:
       AddDataPackFromPath(
-          GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"),
+          GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
           SCALE_FACTOR_100P);
       AddDataPackFromPath(
-          GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+          GetResourcesPakFilePath("ui_resources_standard.pak"),
           SCALE_FACTOR_100P);
       break;
     default:
       if (use_hidpi) {
-        AddDataPackFromPath(GetResourcesPakFilePath(
-                            "theme_resources_200_percent.pak"),
+        AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
                             SCALE_FACTOR_200P);
-        AddDataPackFromPath(GetResourcesPakFilePath(
-                            "ui_resources_200_percent.pak"),
+        AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
                             SCALE_FACTOR_200P);
       } else {
         AddDataPackFromPath(
-            GetResourcesPakFilePath("theme_resources_100_percent.pak"),
+            GetResourcesPakFilePath("theme_resources_standard.pak"),
             SCALE_FACTOR_100P);
         AddDataPackFromPath(
-            GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+            GetResourcesPakFilePath("ui_resources_standard.pak"),
             SCALE_FACTOR_100P);
       }
       break;
diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp
index 2ac5d00..7adde77 100644
--- a/ui/base/strings/ui_strings.gyp
+++ b/ui/base/strings/ui_strings.gyp
@@ -65,7 +65,7 @@
           {
             'destination': '<(PRODUCT_DIR)/ui_unittests_strings',
             'files': [
-              '<(grit_base_out_dir)/ui_resources/ui_resources_100_percent.pak',
+              '<(grit_base_out_dir)/ui_resources/ui_resources_standard.pak',
             ],
           },
         ],