Rename theme_resources_metro_1x.grd to theme_resources_touch_1x.grd

First of several CLs to rename "metro" assets to "touch" so it's clear we can use them on non-Metro touch platforms.

BUG=125265
TEST=compiles

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134717 0039d316-1c4b-4281-b951-d872f2087c98
parent 64d60f09
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/theme_resources_metro_1x.h" type="rc_header">
<output filename="grit/theme_resources_touch_1x.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="theme_resources_metro_1x.pak" type="data_package" />
<output filename="theme_resources_touch_1x.pak" type="data_package" />
</outputs>
<release seq="1">
<includes>
......
......@@ -218,9 +218,9 @@
'includes': [ '../build/grit_action.gypi' ],
},
{
'action_name': 'theme_resources_metro_1x',
'action_name': 'theme_resources_touch_1x',
'variables': {
'grit_grd_file': 'app/theme/theme_resources_metro_1x.grd',
'grit_grd_file': 'app/theme/theme_resources_touch_1x.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
......@@ -283,7 +283,7 @@
{
'destination': '<(PRODUCT_DIR)',
'files': [
'<(grit_out_dir)/theme_resources_metro_1x.pak',
'<(grit_out_dir)/theme_resources_touch_1x.pak',
],
},
],
......
......@@ -37,7 +37,7 @@ theme_resources_2x.pak: %(VersionDir)s\
ui_resources_2x.pak: %(VersionDir)s\
[METRO]
theme_resources_metro_1x.pak: %(VersionDir)s\
theme_resources_touch_1x.pak: %(VersionDir)s\
[GOOGLE_CHROME]
splash-620x300.png: %(ChromeDir)s\
......
......@@ -356,7 +356,7 @@ FILES = [
'optional': ['dev', 'official'],
},
{
'filename': 'theme_resources_metro_1x.pak',
'filename': 'theme_resources_touch_1x.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
'optional': ['dev', 'official'],
......
......@@ -146,7 +146,7 @@
"chrome/app/theme/theme_resources_2x.grd": {
"includes": [21000],
},
"chrome/app/theme/theme_resources_metro_1x.grd": {
"chrome/app/theme/theme_resources_touch_1x.grd": {
"includes": [21000],
},
# This file is generated during the build.
......
......@@ -45,7 +45,7 @@ void ResourceBundle::LoadCommonResources() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_TOUCH:
AddDataPack(GetResourcesPakFilePath("theme_resources_metro_1x.pak"),
AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
ResourceHandle::kScaleFactor100x);
AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
ResourceHandle::kScaleFactor100x);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment