diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 13:13:18 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 13:13:18 +0000 |
| commit | 745aca25f8455af32e92412f435010c881cac2f7 (patch) | |
| tree | f15a1964c6faa7f1d8af6e7197dfc5c031cbb5f0 /webkit | |
| parent | 68e5274a8915947153c148a8d87668c4773bc15b (diff) | |
| download | chromium_src-745aca25f8455af32e92412f435010c881cac2f7.zip chromium_src-745aca25f8455af32e92412f435010c881cac2f7.tar.gz chromium_src-745aca25f8455af32e92412f435010c881cac2f7.tar.bz2 | |
Revert 102266 - Revert 102217 - Enable the Overhang pattern resource on TOUCH_UI builds.
BUG=none
TEST=manually
Review URL: http://codereview.chromium.org/7983043
TBR=fsamuel@chromium.org
Review URL: http://codereview.chromium.org/7989002
TBR=tommi@chromium.org
Review URL: http://codereview.chromium.org/7993004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 2 | ||||
| -rw-r--r-- | webkit/glue/webkitplatformsupport_impl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index 175b776..9e863ba 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -52,7 +52,7 @@ <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB" file="resources\mediaplayer_volume_slider_thumb.png" type="BINDATA" /> <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER" file="resources\mediaplayer_volume_slider_thumb_hover.png" type="BINDATA" /> <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN" file="resources\mediaplayer_volume_slider_thumb_down.png" type="BINDATA" /> - <if expr="is_macosx"> + <if expr="pp_ifdef('touchui') or is_macosx"> <include name="IDR_OVERHANG_PATTERN" file="resources\overhang_pattern.png" type="BINDATA" /> </if> <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" /> diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index b3dfaec..8d2941c 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -394,7 +394,7 @@ const DataResource kDataResources[] = { IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER }, { "mediaplayerVolumeSliderThumbDown", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN }, -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(TOUCH_UI) { "overhangPattern", IDR_OVERHANG_PATTERN }, #endif { "panIcon", IDR_PAN_SCROLL_ICON }, |