Commit e8d0ddb2 authored by sjl@chromium.org's avatar sjl@chromium.org

Add new media resources for UI refresh.

This CL contains the new asserts for the media controls. I'll remove the old stuff
after the webkit side of the change is in.

BUG=88489
TEST=None needed. Purely asset additions.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91771 0039d316-1c4b-4281-b951-d872f2087c98
parent eac54632
...@@ -25,6 +25,32 @@ ...@@ -25,6 +25,32 @@
<include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" /> <include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" />
<include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" /> <include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" />
<include name="IDR_MEDIA_VOLUME_SLIDER_THUMB" file="resources\media_volume_slider_thumb.png" type="BINDATA" /> <include name="IDR_MEDIA_VOLUME_SLIDER_THUMB" file="resources\media_volume_slider_thumb.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_PAUSE_BUTTON" file="resources\mediaplayer_pause.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER" file="resources\mediaplayer_pause_hover.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN" file="resources\mediaplayer_pause_down.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_PLAY_BUTTON" file="resources\mediaplayer_play.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER" file="resources\mediaplayer_play_hover.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN" file="resources\mediaplayer_play_down.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED" file="resources\mediaplayer_play_disabled.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_DISABLED" file="resources\mediaplayer_sound_disabled.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_FULL_BUTTON" file="resources\mediaplayer_sound_full.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_HOVER" file="resources\mediaplayer_sound_full_hover.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_DOWN" file="resources\mediaplayer_sound_full_down.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON" file="resources\mediaplayer_sound_level2.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER" file="resources\mediaplayer_sound_level2_hover.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN" file="resources\mediaplayer_sound_level2_down.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON" file="resources\mediaplayer_sound_level1.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER" file="resources\mediaplayer_sound_level1_hover.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN" file="resources\mediaplayer_sound_level1_down.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_NONE_BUTTON" file="resources\mediaplayer_sound_none.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_HOVER" file="resources\mediaplayer_sound_none_hover.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_DOWN" file="resources\mediaplayer_sound_none_down.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SLIDER_THUMB" file="resources\mediaplayer_slider_thumb.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER" file="resources\mediaplayer_slider_thumb_hover.png" type="BINDATA" />
<include name="IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN" file="resources\mediaplayer_slider_thumb_down.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_DOWN" file="resources\mediaplayer_volume_slider_thumb_down.png" type="BINDATA" />
<include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" /> <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />
<include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" /> <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" />
<include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" /> <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" />
......
...@@ -361,6 +361,36 @@ const DataResource kDataResources[] = { ...@@ -361,6 +361,36 @@ const DataResource kDataResources[] = {
{ "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
{ "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB },
{ "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB }, { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB },
{ "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON },
{ "mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER },
{ "mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN },
{ "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON },
{ "mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER },
{ "mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN },
{ "mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED },
{ "mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED },
{ "mediaplayerSoundFull", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON },
{ "mediaplayerSoundFullHover", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_HOVER },
{ "mediaplayerSoundFullDown", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_DOWN },
{ "mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON },
{ "mediaplayerSoundLevel2Hover",
IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER },
{ "mediaplayerSoundLevel2Down", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN },
{ "mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON },
{ "mediaplayerSoundLevel1Hover",
IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER },
{ "mediaplayerSoundLevel1Down", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN },
{ "mediaplayerSoundNone", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON },
{ "mediaplayerSoundNoneHover", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_HOVER },
{ "mediaplayerSoundNoneDown", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_DOWN },
{ "mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB },
{ "mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER },
{ "mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN },
{ "mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB },
{ "mediaplayerVolumeSliderThumbHover",
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER },
{ "mediaplayerVolumeSliderThumbDown",
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN },
{ "panIcon", IDR_PAN_SCROLL_ICON }, { "panIcon", IDR_PAN_SCROLL_ICON },
{ "searchCancel", IDR_SEARCH_CANCEL }, { "searchCancel", IDR_SEARCH_CANCEL },
{ "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED },
......
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