summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 23:43:20 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 23:43:20 +0000
commit9b207915881073e071333d7f0cf83ab5167946cd (patch)
treef01d9f98e916b3f2a992645f19d4a1966fb4081e
parentc9343f1d1b041a35754975cded83b01f41ab46fd (diff)
downloadchromium_src-9b207915881073e071333d7f0cf83ab5167946cd.zip
chromium_src-9b207915881073e071333d7f0cf83ab5167946cd.tar.gz
chromium_src-9b207915881073e071333d7f0cf83ab5167946cd.tar.bz2
ui: Remove Copy action of gfx_resources.pak
Nobody needs it, I fixed the Blink usage, so we can remove this now. BUG=None R=oshima@chromium.org,ben@chromium.org TBR=ben Review URL: https://codereview.chromium.org/44263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231153 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/resources/ui_resources.grd3
-rw-r--r--ui/ui_resources.gypi12
2 files changed, 0 insertions, 15 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 26eecf8..dee0e0d 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -6,9 +6,6 @@
</output>
<output filename="grit/ui_resources_map.cc" type="resource_map_source" context="default_100_percent" />
<output filename="grit/ui_resources_map.h" type="resource_map_header" context="default_100_percent" />
- <!-- 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_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" />
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index 4008f0d..8336ef3 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -25,7 +25,6 @@
},
'includes': [ '../build/grit_action.gypi' ],
},
-
{
'action_name': 'ui_unscaled_resources',
'variables': {
@@ -33,17 +32,6 @@
},
'includes': [ '../build/grit_action.gypi' ],
},
-
- ],
- # gfx_resources.pak is used by DumpRenderTree.
- # TODO(oshima): Update DumpRenderTree.gyp to use new pak file and
- # remove this.
- 'copies': [ {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/',
- 'files' : [
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/gfx_resources.pak',
- ],
- },
],
'includes': [ '../build/grit_target.gypi' ],
},