Index: content/child/blink_platform_impl.cc |
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc |
index 95badb08c700ac0f247a02a98dc2211c8203e9df..732605769dba71c83f0b0abd21af1b1ba7557590 100644 |
--- a/content/child/blink_platform_impl.cc |
+++ b/content/child/blink_platform_impl.cc |
@@ -516,62 +516,27 @@ struct DataResource { |
const DataResource kDataResources[] = { |
{"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P}, |
{"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P}, |
- {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P}, |
{"mediaplayerPauseNew", |
IDR_MEDIAPLAYER_PAUSE_BUTTON_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P}, |
{"mediaplayerPlayNew", |
IDR_MEDIAPLAYER_PLAY_BUTTON_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerPlayDisabled", |
- IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED, |
- ui::SCALE_FACTOR_100P}, |
- {"mediaplayerSoundLevel3", |
- IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerSoundLevel3New", |
IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerSoundLevel2", |
- IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, |
- ui::SCALE_FACTOR_100P}, |
- {"mediaplayerSoundLevel1", |
- IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, |
- ui::SCALE_FACTOR_100P}, |
- {"mediaplayerSoundLevel0", |
- IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerSoundLevel0New", |
IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerSoundDisabled", |
- IDR_MEDIAPLAYER_SOUND_DISABLED, |
- ui::SCALE_FACTOR_100P}, |
- {"mediaplayerSliderThumb", |
- IDR_MEDIAPLAYER_SLIDER_THUMB, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerSliderThumbNew", |
IDR_MEDIAPLAYER_SLIDER_THUMB_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerVolumeSliderThumb", |
- IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerVolumeSliderThumbNew", |
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerVolumeSliderThumbDisabled", |
- IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, |
- ui::SCALE_FACTOR_100P}, |
- {"mediaplayerClosedCaption", |
- IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerClosedCaptionNew", |
IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerClosedCaptionDisabled", |
- IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerClosedCaptionDisabledNew", |
IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW, |
ui::SCALE_FACTOR_100P}, |
@@ -581,51 +546,24 @@ const DataResource kDataResources[] = { |
{"mediaplayerExitFullscreen", |
IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerFullscreen", |
- IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, |
- ui::SCALE_FACTOR_100P}, |
- {"mediaplayerCastOff", |
- IDR_MEDIAPLAYER_CAST_BUTTON_OFF, |
- ui::SCALE_FACTOR_100P}, |
- {"mediaplayerCastOn", |
- IDR_MEDIAPLAYER_CAST_BUTTON_ON, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerCastOffNew", |
IDR_MEDIAPLAYER_CAST_BUTTON_OFF_NEW, |
ui::SCALE_FACTOR_100P}, |
{"mediaplayerCastOnNew", |
IDR_MEDIAPLAYER_CAST_BUTTON_ON_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerFullscreenDisabled", |
- IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, |
- ui::SCALE_FACTOR_100P}, |
- {"mediaplayerOverlayCastOff", |
- IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerOverlayCastOffNew", |
IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerOverlayPlay", |
- IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerOverlayPlayNew", |
IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerTrackSelectionCheckmark", |
- IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerTrackSelectionCheckmarkNew", |
IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerClosedCaptionsIcon", |
- IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerClosedCaptionsIconNew", |
IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW, |
ui::SCALE_FACTOR_100P}, |
- {"mediaplayerSubtitlesIcon", |
- IDR_MEDIAPLAYER_SUBTITLES_ICON, |
- ui::SCALE_FACTOR_100P}, |
{"mediaplayerSubtitlesIconNew", |
IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW, |
ui::SCALE_FACTOR_100P}, |
@@ -655,10 +593,6 @@ const DataResource kDataResources[] = { |
IDR_UASTYLE_FULLSCREEN_ANDROID_CSS, |
ui::SCALE_FACTOR_NONE}, |
// Not limited to Android since it's used for mobile layouts in inspector. |
- {"mediaControlsAndroid.css", |
- IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS, |
- ui::SCALE_FACTOR_NONE}, |
- // Not limited to Android since it's used for mobile layouts in inspector. |
{"mediaControlsAndroidNew.css", |
IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS, |
ui::SCALE_FACTOR_NONE}, |
@@ -678,9 +612,6 @@ const DataResource kDataResources[] = { |
ui::SCALE_FACTOR_NONE}, |
{"svg.css", IDR_UASTYLE_SVG_CSS, ui::SCALE_FACTOR_NONE}, |
{"mathml.css", IDR_UASTYLE_MATHML_CSS, ui::SCALE_FACTOR_NONE}, |
- {"mediaControls.css", |
- IDR_UASTYLE_MEDIA_CONTROLS_CSS, |
- ui::SCALE_FACTOR_NONE}, |
{"mediaControlsNew.css", |
IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS, |
ui::SCALE_FACTOR_NONE}, |