Commit e62a23a8 authored by fsamuel@chromium.org's avatar fsamuel@chromium.org

Enable the Overhang pattern resource on TOUCH_UI builds.

BUG=none
TEST=manually


Review URL: http://codereview.chromium.org/7983043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102217 0039d316-1c4b-4281-b951-d872f2087c98
parent 6560e3b5
...@@ -52,7 +52,7 @@ ...@@ -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" 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_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" /> <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" /> <include name="IDR_OVERHANG_PATTERN" file="resources\overhang_pattern.png" type="BINDATA" />
</if> </if>
<include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" /> <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />
......
...@@ -394,7 +394,7 @@ const DataResource kDataResources[] = { ...@@ -394,7 +394,7 @@ const DataResource kDataResources[] = {
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER }, IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER },
{ "mediaplayerVolumeSliderThumbDown", { "mediaplayerVolumeSliderThumbDown",
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN }, IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN },
#if defined(OS_MACOSX) #if defined(OS_MACOSX) || defined(TOUCH_UI)
{ "overhangPattern", IDR_OVERHANG_PATTERN }, { "overhangPattern", IDR_OVERHANG_PATTERN },
#endif #endif
{ "panIcon", IDR_PAN_SCROLL_ICON }, { "panIcon", IDR_PAN_SCROLL_ICON },
......
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