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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/child/blink_platform_impl.cc

Issue 2767823002: Media Remoting: Add interstitial elements to media element shadow dom. (Closed)
Patch Set: Created 3 years, 9 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 | « content/app/strings/content_strings.grd ('k') | media/base/media_observer.h » ('j') | third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp » ('J')
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 e00332a7c1f8c74c7a609a7c7cbfd29f3e796ebe..6c68e53f8538c8bbc33b23409bc3ea24ac858b0f 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -134,6 +134,8 @@ static int ToMessageID(WebLocalizedString::Name name) {
return IDS_AX_MEDIA_CAST_OFF_BUTTON;
case WebLocalizedString::AXMediaCastOnButton:
return IDS_AX_MEDIA_CAST_ON_BUTTON;
+ case WebLocalizedString::AXMediaRemotingDisableButton:
+ return IDS_AX_MEDIA_REMOTING_DISABLE_BUTTON;
case WebLocalizedString::AXMediaDownloadButton:
return IDS_AX_MEDIA_DOWNLOAD_BUTTON;
case WebLocalizedString::AXMediaOverflowButton:
@@ -174,6 +176,8 @@ static int ToMessageID(WebLocalizedString::Name name) {
return IDS_AX_MEDIA_CAST_OFF_BUTTON_HELP;
case WebLocalizedString::AXMediaCastOnButtonHelp:
return IDS_AX_MEDIA_CAST_ON_BUTTON_HELP;
+ case WebLocalizedString::AXMediaRemotingDisableButtonHelp:
+ return IDS_AX_MEDIA_REMOTING_DISABLE_BUTTON_HELP;
case WebLocalizedString::AXMediaOverflowButtonHelp:
return IDS_AX_MEDIA_OVERFLOW_BUTTON_HELP;
case WebLocalizedString::AXMillisecondFieldText:
@@ -492,121 +496,89 @@ 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,
+ {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P},
+ {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P},
+ {"mediaplayerSoundNotMuted", IDR_MEDIAPLAYER_SOUND_NOT_MUTED_BUTTON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerPlay",
- IDR_MEDIAPLAYER_PLAY_BUTTON,
+ {"mediaplayerSoundMuted", IDR_MEDIAPLAYER_SOUND_MUTED_BUTTON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerSoundNotMuted",
- IDR_MEDIAPLAYER_SOUND_NOT_MUTED_BUTTON,
+ {"mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB,
ui::SCALE_FACTOR_100P},
- {"mediaplayerSoundMuted",
- IDR_MEDIAPLAYER_SOUND_MUTED_BUTTON,
+ {"mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB,
ui::SCALE_FACTOR_100P},
- {"mediaplayerSliderThumb",
- IDR_MEDIAPLAYER_SLIDER_THUMB,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerVolumeSliderThumb",
- IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerClosedCaption",
- IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON,
+ {"mediaplayerClosedCaption", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON,
ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaptionDisabled",
- IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED,
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P},
+ {"mediaplayerEnterFullscreen", IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerEnterFullscreen",
- IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON,
+ {"mediaplayerExitFullscreen", IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerExitFullscreen",
- IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON,
+ {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF,
ui::SCALE_FACTOR_100P},
- {"mediaplayerCastOff",
- IDR_MEDIAPLAYER_CAST_BUTTON_OFF,
+ {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerCastOn",
- IDR_MEDIAPLAYER_CAST_BUTTON_ON,
+ {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
ui::SCALE_FACTOR_100P},
- {"mediaplayerOverlayCastOff",
- IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
+ {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerOverlayPlay",
- IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
+ {"mediaremotingDisable", IDR_MEDIA_REMOTING_DISABLE_BUTTON,
ui::SCALE_FACTOR_100P},
{"mediaplayerTrackSelectionCheckmark",
- IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK,
- ui::SCALE_FACTOR_100P},
- {"mediaplayerClosedCaptionsIcon",
- IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
+ IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, ui::SCALE_FACTOR_100P},
+ {"mediaplayerClosedCaptionsIcon", IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerSubtitlesIcon",
- IDR_MEDIAPLAYER_SUBTITLES_ICON,
+ {"mediaplayerSubtitlesIcon", IDR_MEDIAPLAYER_SUBTITLES_ICON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerOverflowMenu",
- IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON,
+ {"mediaplayerOverflowMenu", IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON,
ui::SCALE_FACTOR_100P},
- {"mediaplayerDownloadIcon",
- IDR_MEDIAPLAYER_DOWNLOAD_ICON,
+ {"mediaplayerDownloadIcon", IDR_MEDIAPLAYER_DOWNLOAD_ICON,
ui::SCALE_FACTOR_100P},
{"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
{"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
{"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
{"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
{"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
- {"generatePasswordHover",
- IDR_PASSWORD_GENERATION_ICON_HOVER,
+ {"generatePasswordHover", IDR_PASSWORD_GENERATION_ICON_HOVER,
ui::SCALE_FACTOR_100P},
{"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE},
{"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE},
{"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE},
// Not limited to Android since it's used for mobile layouts in inspector.
- {"themeChromiumAndroid.css",
- IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS,
+ {"themeChromiumAndroid.css", IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS,
ui::SCALE_FACTOR_NONE},
// Not limited to Android since it's used for mobile layouts in inspector.
- {"fullscreenAndroid.css",
- IDR_UASTYLE_FULLSCREEN_ANDROID_CSS,
- ui::SCALE_FACTOR_NONE},
+ {"fullscreenAndroid.css", 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,
+ {"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",
- IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS,
+ {"themeChromiumLinux.css", IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS,
ui::SCALE_FACTOR_NONE},
{"themeInputMultipleFields.css",
- IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS,
- ui::SCALE_FACTOR_NONE},
+ IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS, ui::SCALE_FACTOR_NONE},
#if defined(OS_MACOSX)
{"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE},
#endif
{"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE},
- {"themeWinQuirks.css",
- IDR_UASTYLE_THEME_WIN_QUIRKS_CSS,
+ {"themeWinQuirks.css", IDR_UASTYLE_THEME_WIN_QUIRKS_CSS,
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,
+ {"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},
- {"viewportAndroid.css",
- IDR_UASTYLE_VIEWPORT_ANDROID_CSS,
+ {"viewportAndroid.css", IDR_UASTYLE_VIEWPORT_ANDROID_CSS,
ui::SCALE_FACTOR_NONE},
- {"viewportTelevision.css",
- IDR_UASTYLE_VIEWPORT_TELEVISION_CSS,
+ {"viewportTelevision.css", IDR_UASTYLE_VIEWPORT_TELEVISION_CSS,
ui::SCALE_FACTOR_NONE},
- {"InspectorOverlayPage.html",
- IDR_INSPECTOR_OVERLAY_PAGE_HTML,
+ {"InspectorOverlayPage.html", IDR_INSPECTOR_OVERLAY_PAGE_HTML,
ui::SCALE_FACTOR_NONE},
- {"DocumentXMLTreeViewer.css",
- IDR_DOCUMENTXMLTREEVIEWER_CSS,
+ {"DocumentXMLTreeViewer.css", IDR_DOCUMENTXMLTREEVIEWER_CSS,
ui::SCALE_FACTOR_NONE},
- {"DocumentXMLTreeViewer.js",
- IDR_DOCUMENTXMLTREEVIEWER_JS,
+ {"DocumentXMLTreeViewer.js", IDR_DOCUMENTXMLTREEVIEWER_JS,
ui::SCALE_FACTOR_NONE},
#ifdef IDR_PICKER_COMMON_JS
{"pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE},
@@ -618,11 +590,9 @@ const DataResource kDataResources[] = {
{"pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE},
{"suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE},
{"suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE},
- {"colorSuggestionPicker.js",
- IDR_COLOR_SUGGESTION_PICKER_JS,
+ {"colorSuggestionPicker.js", IDR_COLOR_SUGGESTION_PICKER_JS,
ui::SCALE_FACTOR_NONE},
- {"colorSuggestionPicker.css",
- IDR_COLOR_SUGGESTION_PICKER_CSS,
+ {"colorSuggestionPicker.css", IDR_COLOR_SUGGESTION_PICKER_CSS,
ui::SCALE_FACTOR_NONE},
#endif
};
« no previous file with comments | « content/app/strings/content_strings.grd ('k') | media/base/media_observer.h » ('j') | third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698