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

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

20 files changed, 86 insertions, 73 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index 6e1fb89..7230379 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -453,7 +453,7 @@
         'wm/workspace/workspace_manager_unittest.cc',
         'wm/workspace/workspace_window_resizer_unittest.cc',
 
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
       ],
       'conditions': [
         ['use_ibus==1', {
@@ -568,7 +568,7 @@
         'shell/window_type_launcher.h',
         'shell/window_watcher.cc',
         'shell/window_watcher.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
         '../content/app/startup_helper_win.cc',
         '../ui/views/test/test_views_delegate.cc',
       ],
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index f049e90..1dd6d9b 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -6,11 +6,11 @@
     </output>
     <output filename="grit/theme_resources_map.cc" type="resource_map_source" context="default_100_percent" />
     <output filename="grit/theme_resources_map.h" type="resource_map_header" context="default_100_percent" />
-    <output filename="theme_resources_standard.pak" type="data_package" context="default_100_percent" />
-    <output filename="theme_resources_2x.pak" type="data_package" context="default_200_percent" />
-    <output filename="theme_resources_touch_1x.pak" type="data_package" context="touch_100_percent" />
-    <output filename="theme_resources_touch_2x.pak" type="data_package" context="touch_200_percent" />
-    <output filename="theme_resources_standard.rc" type="rc_all" context="default_100_percent" />
+    <output filename="theme_resources_100_percent.pak" type="data_package" context="default_100_percent" />
+    <output filename="theme_resources_200_percent.pak" type="data_package" context="default_200_percent" />
+    <output filename="theme_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
+    <output filename="theme_resources_touch_200_percent.pak" type="data_package" context="touch_200_percent" />
+    <output filename="theme_resources_100_percent.rc" type="rc_all" context="default_100_percent" />
   </outputs>
   <release seq="1">
     <structures fallback_to_low_resolution="true">
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 6619dc1..b309844 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -98,10 +98,10 @@
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-                '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
 
@@ -292,8 +292,8 @@
                 'browser/mac/install.sh',
                 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
                 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
-                '<(grit_out_dir)/theme_resources_standard.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
+                '<(grit_out_dir)/theme_resources_100_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
                 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
                 # Note: pseudo_locales are generated via the packed_resources
                 # dependency but not copied to the final target.  See
@@ -534,8 +534,8 @@
                 }],
                 ['enable_hidpi==1', {
                   'mac_bundle_resources': [
-                    '<(grit_out_dir)/theme_resources_2x.pak',
-                    '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_2x.pak',
+                    '<(grit_out_dir)/theme_resources_200_percent.pak',
+                    '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
                   ],
                 }],
               ],  # conditions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 78be1d3..85db5e3 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -236,8 +236,8 @@
             {
               'destination': '<(PRODUCT_DIR)',
               'files': [
-                '<(grit_out_dir)/theme_resources_standard.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
+                '<(grit_out_dir)/theme_resources_100_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
               ],
             },
           ],
@@ -247,8 +247,8 @@
             {
               'destination': '<(PRODUCT_DIR)',
               'files': [
-                '<(grit_out_dir)/theme_resources_2x.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_2x.pak',
+                '<(grit_out_dir)/theme_resources_200_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
               ],
             },
           ],
@@ -258,10 +258,10 @@
             {
               'destination': '<(PRODUCT_DIR)',
               'files': [
-                '<(grit_out_dir)/theme_resources_touch_1x.pak',
-                '<(grit_out_dir)/theme_resources_touch_2x.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_2x.pak',
+                '<(grit_out_dir)/theme_resources_touch_100_percent.pak',
+                '<(grit_out_dir)/theme_resources_touch_200_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_100_percent.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_200_percent.pak',
               ],
             },
           ],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 980ccb9..35158ac 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -646,11 +646,11 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
 
@@ -2356,11 +2356,11 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
           ],
@@ -3226,11 +3226,11 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
           ],
@@ -3492,11 +3492,11 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
           ],
@@ -3614,11 +3614,11 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
           ],
@@ -3981,9 +3981,9 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
@@ -4100,9 +4100,9 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi
index 1648a06..4f011f8 100644
--- a/chrome/test/gpu/test_support_gpu.gypi
+++ b/chrome/test/gpu/test_support_gpu.gypi
@@ -56,11 +56,11 @@
         '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
         '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
       ],
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index cc0c571..0559a3c 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -425,7 +425,7 @@
         'test/net/test_automation_resource_message_filter.cc',
         'test/net/test_automation_resource_message_filter.h',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
         'test_utils.cc',
         'test_utils.h',
       ],
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 841ab57..db4fc65 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -223,7 +223,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 24e2002..1ebd7e7 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -191,7 +191,7 @@
           'action_name': 'repack_test_support_aura_pack',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
             ],
           },
           'inputs': [
@@ -226,7 +226,7 @@
       ],
       'sources': [
         'demo/demo_main.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
       ],
     },
     {
@@ -249,7 +249,7 @@
       ],
       'sources': [
         'bench/bench_main.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
       ],
     },
     {
@@ -283,7 +283,7 @@
         'event_filter_unittest.cc',
         'event_unittest.cc',
         'window_unittest.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
       ],
       'conditions': [
         # osmesa GL implementation is used on linux.
diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc
index d5f7316..141d3af 100644
--- a/ui/base/resource/resource_bundle_android.cc
+++ b/ui/base/resource/resource_bundle_android.cc
@@ -31,9 +31,11 @@ namespace ui {
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
+  AddDataPackFromPath(GetResourcesPakFilePath(
+                      "theme_resources_100_percent.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
+  AddDataPackFromPath(GetResourcesPakFilePath(
+                      "ui_resources_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 bdb6fcc..f443e57 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -44,29 +44,36 @@ void ResourceBundle::LoadCommonResources() {
 
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     // 1x touch
-    AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
+    AddDataPackFromPath(GetResourcesPakFilePath(
+                        "theme_resources_touch_100_percent.pak"),
                         SCALE_FACTOR_100P);
-    AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch.pak"),
+    AddDataPackFromPath(GetResourcesPakFilePath(
+                        "ui_resources_touch_100_percent.pak"),
                         SCALE_FACTOR_100P);
     if (ShouldLoad2xResources()) {
       // 2x touch
       AddDataPackFromPath(
-          GetResourcesPakFilePath("theme_resources_touch_2x.pak"),
+          GetResourcesPakFilePath("theme_resources_touch_200_percent.pak"),
           SCALE_FACTOR_200P);
-      AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch_2x.pak"),
+      AddDataPackFromPath(GetResourcesPakFilePath(
+                          "ui_resources_touch_200_percent.pak"),
                           SCALE_FACTOR_200P);
     }
   } else {
     // 1x non touch
-    AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
+    AddDataPackFromPath(GetResourcesPakFilePath(
+                        "theme_resources_100_percent.pak"),
                         SCALE_FACTOR_100P);
-    AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
+    AddDataPackFromPath(GetResourcesPakFilePath(
+                        "ui_resources_100_percent.pak"),
                         SCALE_FACTOR_100P);
     if (ShouldLoad2xResources()) {
       // 2x non touch
-      AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
+      AddDataPackFromPath(GetResourcesPakFilePath(
+                          "theme_resources_200_percent.pak"),
                           SCALE_FACTOR_200P);
-      AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
+      AddDataPackFromPath(GetResourcesPakFilePath(
+                          "ui_resources_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 2b90f5b..628ad48 100644
--- a/ui/base/resource/resource_bundle_gtk.cc
+++ b/ui/base/resource/resource_bundle_gtk.cc
@@ -67,9 +67,11 @@ FilePath GetResourcesPakFilePath(const std::string& pak_name) {
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
+  AddDataPackFromPath(GetResourcesPakFilePath(
+                      "theme_resources_100_percent.pak"),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
+  AddDataPackFromPath(GetResourcesPakFilePath(
+                      "ui_resources_100_percent.pak"),
                       SCALE_FACTOR_100P);
 }
 
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index 7ef486a..bba84d4 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -49,24 +49,26 @@ void ResourceBundle::LoadCommonResources() {
   switch (ui::GetDisplayLayout()) {
     case ui::LAYOUT_TOUCH:
       AddDataPackFromPath(
-          GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
+          GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"),
           SCALE_FACTOR_100P);
       AddDataPackFromPath(
-          GetResourcesPakFilePath("ui_resources_standard.pak"),
+          GetResourcesPakFilePath("ui_resources_100_percent.pak"),
           SCALE_FACTOR_100P);
       break;
     default:
       if (use_hidpi) {
-        AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
+        AddDataPackFromPath(GetResourcesPakFilePath(
+                            "theme_resources_200_percent.pak"),
                             SCALE_FACTOR_200P);
-        AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
+        AddDataPackFromPath(GetResourcesPakFilePath(
+                            "ui_resources_200_percent.pak"),
                             SCALE_FACTOR_200P);
       } else {
         AddDataPackFromPath(
-            GetResourcesPakFilePath("theme_resources_standard.pak"),
+            GetResourcesPakFilePath("theme_resources_100_percent.pak"),
             SCALE_FACTOR_100P);
         AddDataPackFromPath(
-            GetResourcesPakFilePath("ui_resources_standard.pak"),
+            GetResourcesPakFilePath("ui_resources_100_percent.pak"),
             SCALE_FACTOR_100P);
       }
       break;
diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp
index 7adde77..2ac5d00 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_standard.pak',
+              '<(grit_base_out_dir)/ui_resources/ui_resources_100_percent.pak',
             ],
           },
         ],
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index ed5e37c..04c6989 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -125,7 +125,7 @@
         'test/test_suite.h',
         'test/test_utils.cc',
         'test/test_utils.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
       ],
       'conditions': [
         # osmesa GL implementation is used on linux.
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index c165065..b1c732c 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -9,11 +9,11 @@
     <!-- TODO(oshima): Remove gfx_resources.pak once DumpRenderTree.gyp
          is updated. -->
     <output filename="gfx_resources.pak" type="data_package" context="default_100_percent" />
-    <output filename="ui_resources_standard.pak" type="data_package" context="default_100_percent" />
-    <output filename="ui_resources_2x.pak" type="data_package" context="default_200_percent" />
-    <output filename="ui_resources_touch.pak" type="data_package" context="touch_100_percent" />
-    <output filename="ui_resources_touch_2x.pak" type="data_package" context="touch_200_percent" />
-    <output filename="ui_resources_standard.rc" type="rc_all" context="default_100_percent" />
+    <output filename="ui_resources_100_percent.pak" type="data_package" context="default_100_percent" />
+    <output filename="ui_resources_200_percent.pak" type="data_package" context="default_200_percent" />
+    <output filename="ui_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
+    <output filename="ui_resources_touch_200_percent.pak" type="data_package" context="touch_200_percent" />
+    <output filename="ui_resources_100_percent.rc" type="rc_all" context="default_100_percent" />
   </outputs>
   <release seq="1">
     <structures fallback_to_low_resolution="true">
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc
index e341706..6f1a239 100644
--- a/ui/test/test_suite.cc
+++ b/ui/test/test_suite.cc
@@ -55,7 +55,7 @@ void UITestSuite::Initialize() {
 
 #if !defined(OS_MACOSX) && defined(OS_POSIX)
   ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_dir.AppendASCII("ui_resources_standard.pak"),
+      pak_dir.AppendASCII("ui_resources_100_percent.pak"),
       ui::SCALE_FACTOR_100P);
 #endif
 }
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index f921397..51b0beb 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -113,7 +113,7 @@
         'test/run_all_unittests.cc',
         'test/test_suite.cc',
         'test/test_suite.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
       ],
       'include_dirs': [
         '../',
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 50d7298..ebbea68 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -548,7 +548,7 @@
         'widget/widget_unittest.cc',
         'run_all_unittests.cc',
 
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
       ],
       'conditions': [
         ['OS=="win"', {
@@ -704,7 +704,7 @@
         'examples/examples_main.cc',
         'test/test_views_delegate.cc',
         'test/test_views_delegate.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
       ],
       'conditions': [
         ['OS=="win"', {
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 2ac3fae..2b0320f 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -174,7 +174,7 @@
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',