Renamed resource files to be more verbose, specifically:

ui_resources_standard.pak => ui_resources_100_percent.pak
ui_resources_2x.pak => ui_resources_200_percent.pak
ui_resources_standard.rc => ui_resources_100_percent.rc
theme_resources_standard.pak => theme_resources_100_percent.pak
theme_resources_2x.pak => theme_resources_200_percent.pak
theme_resources_standard.rc => theme_resources_100_percent.rc

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@148232 0039d316-1c4b-4281-b951-d872f2087c98

27 files changed, 112 insertions, 99 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index 2fa664a..5883fb1 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -450,7 +450,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', {
@@ -565,7 +565,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 d0f91c5..55c2081 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/browser_tests.isolate b/chrome/browser_tests.isolate
index 376b442..0891a5d 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -1176,8 +1176,8 @@
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/mock4js_browsertest.js',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/net_internals/net_internals_test.js',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/print_preview.js',
-          '<(PRODUCT_DIR)/theme_resources_standard.pak',
-          '<(PRODUCT_DIR)/ui_resources_standard.pak',
+          '<(PRODUCT_DIR)/theme_resources_100_percent.pak',
+          '<(PRODUCT_DIR)/ui_resources_100_percent.pak',
           'test/data/anchor_download_test.png',
           'test/data/clicktoplay.html',
           'test/data/download-anchor-attrib.html',
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 3ea86d5..0ac766d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -643,11 +643,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',
 
@@ -2355,11 +2355,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',
           ],
@@ -3229,11 +3229,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',
           ],
@@ -3490,11 +3490,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',
           ],
@@ -3611,11 +3611,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',
           ],
@@ -3978,9 +3978,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',
@@ -4097,9 +4097,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/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index a094ea8..94afa0c 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -13,8 +13,8 @@ nacl_irt_x86_32.nexe: %(VersionDir)s\
 nacl_irt_x86_64.nexe: %(VersionDir)s\
 icudt.dll: %(VersionDir)s\
 resources.pak: %(VersionDir)s\
-theme_resources_standard.pak: %(VersionDir)s\
-ui_resources_standard.pak: %(VersionDir)s\
+theme_resources_100_percent.pak: %(VersionDir)s\
+ui_resources_100_percent.pak: %(VersionDir)s\
 locales\*.pak: %(VersionDir)s\Locales
 locales\*.dll: %(VersionDir)s\Locales
 npchrome_frame.dll: %(VersionDir)s\
@@ -33,11 +33,11 @@ default_apps\*.crx: %(VersionDir)s\default_apps\
 default_apps\external_extensions.json: %(VersionDir)s\default_apps\
 
 [HIDPI]
-theme_resources_2x.pak: %(VersionDir)s\
-ui_resources_2x.pak: %(VersionDir)s\
+theme_resources_200_percent.pak: %(VersionDir)s\
+ui_resources_200_percent.pak: %(VersionDir)s\
 
 [TOUCH]
-theme_resources_touch_1x.pak: %(VersionDir)s\
+theme_resources_touch_100_percent.pak: %(VersionDir)s\
 
 [GOOGLE_CHROME]
 FlashPlayerApp.exe: %(VersionDir)s\
diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi
index 075ec20..6b580d8 100644
--- a/chrome/test/gpu/test_support_gpu.gypi
+++ b/chrome/test/gpu/test_support_gpu.gypi
@@ -55,11 +55,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/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
index 958f6b2..12af170 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -85,12 +85,12 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'theme_resources_standard.pak',
+    'filename': 'theme_resources_100_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'ui_resources_standard.pak',
+    'filename': 'ui_resources_100_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index 7f1457d..502b5bd 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -87,12 +87,12 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'theme_resources_standard.pak',
+    'filename': 'theme_resources_100_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'ui_resources_standard.pak',
+    'filename': 'ui_resources_100_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 834231e..8d84fdd 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -351,29 +351,29 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'theme_resources_standard.pak',
+    'filename': 'theme_resources_100_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'theme_resources_2x.pak',
+    'filename': 'theme_resources_200_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'optional': ['dev', 'official'],
   },
   {
-    'filename': 'theme_resources_touch_1x.pak',
+    'filename': 'theme_resources_touch_100_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'optional': ['dev', 'official'],
   },
   {
-    'filename': 'ui_resources_standard.pak',
+    'filename': 'ui_resources_100_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'ui_resources_2x.pak',
+    'filename': 'ui_resources_200_percent.pak',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
     'optional': ['dev', 'official'],
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index cdb7503..3272b4ab 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -622,8 +622,8 @@
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/locales/en-US.pak',
-          '<(PRODUCT_DIR)/theme_resources_standard.pak',
-          '<(PRODUCT_DIR)/ui_resources_standard.pak',
+          '<(PRODUCT_DIR)/theme_resources_100_percent.pak',
+          '<(PRODUCT_DIR)/ui_resources_100_percent.pak',
         ],
         'isolate_dependency_untracked': [
           'test/data/firefox2_nss/',
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 213b32e..20b0c98 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -230,7 +230,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_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index c18a740..4c46218 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -51,19 +51,19 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
                       SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_standard", nil),
-                      SCALE_FACTOR_100P);
-  AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_standard", nil),
-                      SCALE_FACTOR_100P);
+  AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_100_percent",
+                        nil), SCALE_FACTOR_100P);
+  AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_100_percent",
+                        nil), SCALE_FACTOR_100P);
 
   // On Windows and ChromeOS we load either the 1x resource or the 2x resource.
   // 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_2x", nil),
-                        SCALE_FACTOR_200P);
-    AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_2x", nil),
-                        SCALE_FACTOR_200P);
+    AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_200_percent",
+                          nil), SCALE_FACTOR_200P);
+    AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
+                          nil), SCALE_FACTOR_200P);
   }
 #endif
 }
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 e2c9970..bd2abbb 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 4982add..7c19d98 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 94e647d..265b81c 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -549,7 +549,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"', {
@@ -705,7 +705,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 7687963..3e00b45 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',