| Index: content/child/blink_platform_impl.cc
|
| diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
|
| index 732605769dba71c83f0b0abd21af1b1ba7557590..aa9951d14bd30f5ab86a8ffbac2039ca87ae1ff7 100644
|
| --- a/content/child/blink_platform_impl.cc
|
| +++ b/content/child/blink_platform_impl.cc
|
| @@ -516,29 +516,29 @@ struct DataResource {
|
| const DataResource kDataResources[] = {
|
| {"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P},
|
| {"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P},
|
| - {"mediaplayerPauseNew",
|
| - IDR_MEDIAPLAYER_PAUSE_BUTTON_NEW,
|
| + {"mediaplayerPause",
|
| + IDR_MEDIAPLAYER_PAUSE_BUTTON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerPlayNew",
|
| - IDR_MEDIAPLAYER_PLAY_BUTTON_NEW,
|
| + {"mediaplayerPlay",
|
| + IDR_MEDIAPLAYER_PLAY_BUTTON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerSoundLevel3New",
|
| - IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_NEW,
|
| + {"mediaplayerSoundNotMuted",
|
| + IDR_MEDIAPLAYER_SOUND_NOT_MUTED_BUTTON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerSoundLevel0New",
|
| - IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_NEW,
|
| + {"mediaplayerSoundMuted",
|
| + IDR_MEDIAPLAYER_SOUND_MUTED_BUTTON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerSliderThumbNew",
|
| - IDR_MEDIAPLAYER_SLIDER_THUMB_NEW,
|
| + {"mediaplayerSliderThumb",
|
| + IDR_MEDIAPLAYER_SLIDER_THUMB,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerVolumeSliderThumbNew",
|
| - IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW,
|
| + {"mediaplayerVolumeSliderThumb",
|
| + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerClosedCaptionNew",
|
| - IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW,
|
| + {"mediaplayerClosedCaption",
|
| + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerClosedCaptionDisabledNew",
|
| - IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW,
|
| + {"mediaplayerClosedCaptionDisabled",
|
| + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED,
|
| ui::SCALE_FACTOR_100P},
|
| {"mediaplayerEnterFullscreen",
|
| IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON,
|
| @@ -546,26 +546,26 @@ const DataResource kDataResources[] = {
|
| {"mediaplayerExitFullscreen",
|
| IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerCastOffNew",
|
| - IDR_MEDIAPLAYER_CAST_BUTTON_OFF_NEW,
|
| + {"mediaplayerCastOff",
|
| + IDR_MEDIAPLAYER_CAST_BUTTON_OFF,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerCastOnNew",
|
| - IDR_MEDIAPLAYER_CAST_BUTTON_ON_NEW,
|
| + {"mediaplayerCastOn",
|
| + IDR_MEDIAPLAYER_CAST_BUTTON_ON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerOverlayCastOffNew",
|
| - IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW,
|
| + {"mediaplayerOverlayCastOff",
|
| + IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerOverlayPlayNew",
|
| - IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW,
|
| + {"mediaplayerOverlayPlay",
|
| + IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerTrackSelectionCheckmarkNew",
|
| - IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW,
|
| + {"mediaplayerTrackSelectionCheckmark",
|
| + IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerClosedCaptionsIconNew",
|
| - IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW,
|
| + {"mediaplayerClosedCaptionsIcon",
|
| + IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
|
| ui::SCALE_FACTOR_100P},
|
| - {"mediaplayerSubtitlesIconNew",
|
| - IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW,
|
| + {"mediaplayerSubtitlesIcon",
|
| + IDR_MEDIAPLAYER_SUBTITLES_ICON,
|
| ui::SCALE_FACTOR_100P},
|
| {"mediaplayerOverflowMenu",
|
| IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON,
|
| @@ -593,8 +593,8 @@ 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.
|
| - {"mediaControlsAndroidNew.css",
|
| - IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS,
|
| + {"mediaControlsAndroid.css",
|
| + IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS,
|
| ui::SCALE_FACTOR_NONE},
|
| // Not limited to Linux since it's used for mobile layouts in inspector.
|
| {"themeChromiumLinux.css",
|
| @@ -612,8 +612,8 @@ 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},
|
| - {"mediaControlsNew.css",
|
| - IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS,
|
| + {"mediaControls.css",
|
| + IDR_UASTYLE_MEDIA_CONTROLS_CSS,
|
| ui::SCALE_FACTOR_NONE},
|
| {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE},
|
| {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE},
|
|
|