Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1156)

Unified Diff: content/child/blink_platform_impl.cc

Issue 1197033007: Added resource name mappings for new media playback UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/html_viewer/blink_resource_constants.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 8c19647b15b705b17b61b48751d4158d3545c578..490a54dbf160badb6fcb8426ee9ce94cf38e1c52 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -796,6 +796,9 @@ 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},
{"mediaplayerPauseHover",
IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
@@ -803,6 +806,9 @@ const DataResource kDataResources[] = {
IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P},
+ {"mediaplayerPlayNew",
+ IDR_MEDIAPLAYER_PLAY_BUTTON_NEW,
+ ui::SCALE_FACTOR_100P},
{"mediaplayerPlayHover",
IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
@@ -815,6 +821,9 @@ const DataResource kDataResources[] = {
{"mediaplayerSoundLevel3",
IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON,
ui::SCALE_FACTOR_100P},
+ {"mediaplayerSoundLevel3New",
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_NEW,
+ ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel3Hover",
IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
@@ -842,6 +851,9 @@ const DataResource kDataResources[] = {
{"mediaplayerSoundLevel0",
IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON,
ui::SCALE_FACTOR_100P},
+ {"mediaplayerSoundLevel0New",
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_NEW,
+ ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel0Hover",
IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
@@ -854,6 +866,9 @@ const DataResource kDataResources[] = {
{"mediaplayerSliderThumb",
IDR_MEDIAPLAYER_SLIDER_THUMB,
ui::SCALE_FACTOR_100P},
+ {"mediaplayerSliderThumbNew",
+ IDR_MEDIAPLAYER_SLIDER_THUMB_NEW,
+ ui::SCALE_FACTOR_100P},
{"mediaplayerSliderThumbHover",
IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER,
ui::SCALE_FACTOR_100P},
@@ -863,6 +878,9 @@ const DataResource kDataResources[] = {
{"mediaplayerVolumeSliderThumb",
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB,
ui::SCALE_FACTOR_100P},
+ {"mediaplayerVolumeSliderThumbNew",
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW,
+ ui::SCALE_FACTOR_100P},
{"mediaplayerVolumeSliderThumbHover",
IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER,
ui::SCALE_FACTOR_100P},
@@ -875,6 +893,9 @@ const DataResource kDataResources[] = {
{"mediaplayerClosedCaption",
IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON,
ui::SCALE_FACTOR_100P},
+ {"mediaplayerClosedCaptionNew",
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW,
+ ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaptionHover",
IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
@@ -884,6 +905,15 @@ const DataResource kDataResources[] = {
{"mediaplayerClosedCaptionDisabled",
IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED,
ui::SCALE_FACTOR_100P},
+ {"mediaplayerClosedCaptionDisabledNew",
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW,
+ ui::SCALE_FACTOR_100P},
+ {"mediaplayerEnterFullscreen",
+ IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON,
+ ui::SCALE_FACTOR_100P},
+ {"mediaplayerExitFullscreen",
+ IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON,
+ ui::SCALE_FACTOR_100P},
{"mediaplayerFullscreen",
IDR_MEDIAPLAYER_FULLSCREEN_BUTTON,
ui::SCALE_FACTOR_100P},
@@ -899,15 +929,27 @@ const DataResource kDataResources[] = {
{"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},
{"panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P},
{"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
{"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
@@ -934,6 +976,9 @@ const DataResource kDataResources[] = {
{"mediaControlsAndroid.css",
IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS,
ui::SCALE_FACTOR_NONE},
+ {"mediaControlsAndroidNew.css",
+ IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS,
+ ui::SCALE_FACTOR_NONE},
#endif
#if !defined(OS_WIN)
{"themeChromiumLinux.css",
@@ -958,6 +1003,9 @@ const DataResource kDataResources[] = {
{"mediaControls.css",
IDR_UASTYLE_MEDIA_CONTROLS_CSS,
ui::SCALE_FACTOR_NONE},
+ {"mediaControlsNew.css",
+ IDR_UASTYLE_MEDIA_CONTROLS_NEW_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},
{"viewportAndroid.css",
« no previous file with comments | « components/html_viewer/blink_resource_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698