Media Controls: Remove 'modern' from media controls resources

This CL removes all uses of the word 'modern' from the media controls
resources.

Bug: 884215
Change-Id: Ib6e28c953dd478bbc73a28697fa45a1562eb9641
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1674330Reviewed-by: Jazz Xu <jazzhsu@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672113}

third_party/blink/renderer/modules/media_controls/media_controls_resource_loader.cc

@@ -31,51 +31,49 @@ MediaControlsResourceLoader::MediaControlsResourceLoader()
 MediaControlsResourceLoader::~MediaControlsResourceLoader() = default;
 
 String MediaControlsResourceLoader::GetMediaControlsCSS() const {
-  return UncompressResourceAsString(IDR_UASTYLE_MODERN_MEDIA_CONTROLS_CSS);
+  return UncompressResourceAsString(IDR_UASTYLE_MEDIA_CONTROLS_CSS);
 }
 
 String MediaControlsResourceLoader::GetMediaControlsAndroidCSS() const {
-  return UncompressResourceAsString(
-      IDR_UASTYLE_MODERN_MEDIA_CONTROLS_ANDROID_CSS);
+  return UncompressResourceAsString(IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS);
 }
 
 // static
 String MediaControlsResourceLoader::GetShadowTimelineStyleSheet() {
   return UncompressResourceAsString(
-      IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_TIMELINE_CSS);
+      IDR_SHADOWSTYLE_MEDIA_CONTROLS_TIMELINE_CSS);
 }
 
 // static
 String MediaControlsResourceLoader::GetShadowLoadingStyleSheet() {
-  return UncompressResourceAsString(
-      IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_LOADING_CSS);
+  return UncompressResourceAsString(IDR_SHADOWSTYLE_MEDIA_CONTROLS_LOADING_CSS);
 }
 
 // static
 String MediaControlsResourceLoader::GetJumpSVGImage() {
-  return UncompressResourceAsString(IDR_MODERN_MEDIA_CONTROLS_JUMP_SVG);
+  return UncompressResourceAsString(IDR_MEDIA_CONTROLS_JUMP_SVG);
 }
 
 // static
 String MediaControlsResourceLoader::GetArrowRightSVGImage() {
-  return UncompressResourceAsString(IDR_MODERN_MEDIA_CONTROLS_ARROW_RIGHT_SVG);
+  return UncompressResourceAsString(IDR_MEDIA_CONTROLS_ARROW_RIGHT_SVG);
 }
 
 // static
 String MediaControlsResourceLoader::GetArrowLeftSVGImage() {
-  return UncompressResourceAsString(IDR_MODERN_MEDIA_CONTROLS_ARROW_LEFT_SVG);
+  return UncompressResourceAsString(IDR_MEDIA_CONTROLS_ARROW_LEFT_SVG);
 }
 
 // static
 String MediaControlsResourceLoader::GetScrubbingMessageStyleSheet() {
   return UncompressResourceAsString(
-      IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_SCRUBBING_MESSAGE_CSS);
+      IDR_SHADOWSTYLE_MEDIA_CONTROLS_SCRUBBING_MESSAGE_CSS);
 }
 
 // static
 String MediaControlsResourceLoader::GetAnimatedArrowStyleSheet() {
   return UncompressResourceAsString(
-      IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_ANIMATED_ARROW_CSS);
+      IDR_SHADOWSTYLE_MEDIA_CONTROLS_ANIMATED_ARROW_CSS);
 }
 
 // static

third_party/blink/renderer/modules/media_controls/resources/modernMediaControls.css → third_party/blink/renderer/modules/media_controls/resources/mediaControls.css

@@ -88,7 +88,7 @@ video::-webkit-media-controls-panel.transparent {
 
 video::-webkit-media-controls:not(.audio-only) div[pseudo="-webkit-media-controls-panel" i] {
   background:
-    -webkit-image-set(url('default_100_percent/modern/gradient_bg.png') 1x)
+    -webkit-image-set(url('default_100_percent/gradient_bg.png') 1x)
     repeat-x bottom left;
 }
 
@@ -104,9 +104,9 @@ video::-webkit-media-controls.sizing-large div[pseudo="-webkit-media-controls-pa
  * shown */
 video::-webkit-media-controls:not(.audio-only) div[pseudo="-webkit-media-controls-panel" i].scrubbing-message {
   background:
-    -webkit-image-set(url('default_100_percent/modern/top_gradient_bg.png') 1x)
+    -webkit-image-set(url('default_100_percent/top_gradient_bg.png') 1x)
     repeat-x top left,
-    -webkit-image-set(url('default_100_percent/modern/gradient_bg.png') 1x)
+    -webkit-image-set(url('default_100_percent/gradient_bg.png') 1x)
     repeat-x bottom left;
 }
 
@@ -696,14 +696,14 @@ video::-webkit-media-controls div[pseudo="-internal-media-controls-loading-panel
 div[pseudo="-internal-media-controls-loading-panel" i]::-internal-media-controls-loading-panel-spinner-mask-1-background {
   left: 0;
   background-image: -webkit-image-set(
-    url(default_100_percent/modern/loading_mask_1.svg) 1x);
+    url(default_100_percent/loading_mask_1.svg) 1x);
   background-position: center left;
 }
 
 div[pseudo="-internal-media-controls-loading-panel" i]::-internal-media-controls-loading-panel-spinner-mask-2-background {
   left: -100%;
   background-image: -webkit-image-set(
-    url(default_100_percent/modern/loading_mask_2.svg) 1x);
+    url(default_100_percent/loading_mask_2.svg) 1x);
   background-position: center right;
 }
 
@@ -1258,7 +1258,7 @@ video::cue(i) {
 video::-internal-media-controls-overlay-cast-button {
     -webkit-appearance: none;
     background-image: -webkit-image-set(
-      url(default_100_percent/modern/mediaplayer_overlay_cast_off.png) 1x);
+      url(default_100_percent/mediaplayer_overlay_cast_off.png) 1x);
     background-size: cover;
     background-repeat: no-repeat;
     background-position: center center;
@@ -1278,7 +1278,7 @@ video::-internal-media-controls-overlay-cast-button {
 
 video::-internal-media-controls-overlay-cast-button.on {
     background-image: -webkit-image-set(
-      url(default_100_percent/modern/mediaplayer_overlay_cast_on.png) 1x);
+      url(default_100_percent/mediaplayer_overlay_cast_on.png) 1x);
 }
 
 /**
@@ -1326,7 +1326,7 @@ video::-webkit-media-controls.immersive-mode div[pseudo="-webkit-media-controls-
 
   /* Taller scrim. */
   background:
-    -webkit-image-set(url('default_100_percent/modern/vr_gradient_bg.png') 1x)
+    -webkit-image-set(url('default_100_percent/vr_gradient_bg.png') 1x)
     repeat-x bottom left;
 }
 
@@ -1400,7 +1400,7 @@ video::-webkit-media-controls.immersive-mode input[pseudo="-internal-media-contr
   border-radius: 4px;
 }
 
-/* Hide modern hover background */
+/* Hide hover background */
 video::-webkit-media-controls.immersive-mode input[pseudo="-webkit-media-controls-play-button" i]::-internal-media-controls-button-hover-background,
 video::-webkit-media-controls.immersive-mode input[pseudo="-webkit-media-controls-fullscreen-button" i]::-internal-media-controls-button-hover-background,
 video::-webkit-media-controls.immersive-mode input[pseudo="-internal-media-controls-overflow-button" i]::-internal-media-controls-button-hover-background {
@@ -1410,7 +1410,7 @@ video::-webkit-media-controls.immersive-mode input[pseudo="-internal-media-contr
 @media (-webkit-min-device-pixel-ratio: 2) {
   video::-webkit-media-controls.immersive-mode div[pseudo="-webkit-media-controls-panel" i] {
     background:
-      -webkit-image-set(url('default_200_percent/modern/vr_gradient_bg.png') 1x)
+      -webkit-image-set(url('default_200_percent/vr_gradient_bg.png') 1x)
       repeat-x bottom left auto 198px;
   }
 }

third_party/blink/renderer/modules/media_controls/resources/mediaInterstitials.css

@@ -108,8 +108,8 @@ video::-internal-media-remoting-toast-message {
 
 video::-internal-media-remoting-cast-icon {
     background-image: -webkit-image-set(
-      url(default_100_percent/modern/mediaremoting_cast.png) 1x,
-      url(default_200_percent/modern/mediaremoting_cast.png) 2x);
+      url(default_100_percent/mediaremoting_cast.png) 1x,
+      url(default_200_percent/mediaremoting_cast.png) 2x);
 }
 
 video::-internal-picture-in-picture-interstitial-message.sizing-medium {

third_party/blink/renderer/modules/media_controls/resources/media_controls_resources.grd

@@ -9,18 +9,18 @@
   </outputs>
   <release seq="1">
     <structures fallback_to_low_resolution="true">
-      <structure type="chrome_html" name="IDR_UASTYLE_MODERN_MEDIA_CONTROLS_CSS" file="modernMediaControls.css" flattenhtml="true" compress="gzip" />
+      <structure type="chrome_html" name="IDR_UASTYLE_MEDIA_CONTROLS_CSS" file="mediaControls.css" flattenhtml="true" compress="gzip" />
       <structure type="chrome_html" name="IDR_UASTYLE_MEDIA_INTERSTITIALS_CSS" file="mediaInterstitials.css" flattenhtml="true" compress="gzip" />
-      <structure type="chrome_html" name="IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_LOADING_CSS" file="modernMediaControls_loading.css" flattenhtml="true" compress="gzip" />
+      <structure type="chrome_html" name="IDR_SHADOWSTYLE_MEDIA_CONTROLS_LOADING_CSS" file="mediaControls_loading.css" flattenhtml="true" compress="gzip" />
     </structures>
     <includes>
-      <include name="IDR_UASTYLE_MODERN_MEDIA_CONTROLS_ANDROID_CSS" file="modernMediaControls_Android.css" type="BINDATA" compress="gzip" />
-      <include name="IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_TIMELINE_CSS" file="modernMediaControls_timeline.css" type="BINDATA" compress="gzip" />
-      <include name="IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_ANIMATED_ARROW_CSS" file="modernMediaControls_animated_arrow.css" type="BINDATA" compress="gzip" />
-      <include name="IDR_SHADOWSTYLE_MODERN_MEDIA_CONTROLS_SCRUBBING_MESSAGE_CSS" file="modernMediaControls_scrubbing_message.css" type="BINDATA" compress="gzip" />
-      <include name="IDR_MODERN_MEDIA_CONTROLS_JUMP_SVG" file="jump_image.svg" type="BINDATA" compress="gzip" />
-      <include name="IDR_MODERN_MEDIA_CONTROLS_ARROW_RIGHT_SVG" file="ic_arrow_right.svg" type="BINDATA" compress="gzip" />
-      <include name="IDR_MODERN_MEDIA_CONTROLS_ARROW_LEFT_SVG" file="ic_arrow_left.svg" type="BINDATA" compress="gzip" />
+      <include name="IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS" file="mediaControls_Android.css" type="BINDATA" compress="gzip" />
+      <include name="IDR_SHADOWSTYLE_MEDIA_CONTROLS_TIMELINE_CSS" file="mediaControls_timeline.css" type="BINDATA" compress="gzip" />
+      <include name="IDR_SHADOWSTYLE_MEDIA_CONTROLS_ANIMATED_ARROW_CSS" file="mediaControls_animated_arrow.css" type="BINDATA" compress="gzip" />
+      <include name="IDR_SHADOWSTYLE_MEDIA_CONTROLS_SCRUBBING_MESSAGE_CSS" file="mediaControls_scrubbing_message.css" type="BINDATA" compress="gzip" />
+      <include name="IDR_MEDIA_CONTROLS_JUMP_SVG" file="jump_image.svg" type="BINDATA" compress="gzip" />
+      <include name="IDR_MEDIA_CONTROLS_ARROW_RIGHT_SVG" file="ic_arrow_right.svg" type="BINDATA" compress="gzip" />
+      <include name="IDR_MEDIA_CONTROLS_ARROW_LEFT_SVG" file="ic_arrow_left.svg" type="BINDATA" compress="gzip" />
     </includes>
   </release>
 </grit>