Commit f8b1dde6 authored by CJ DiMeglio's avatar CJ DiMeglio Committed by Commit Bot

Remove kMediaTextTrackList and kMediaTrackSelectionCheckmark

This should have been removed with
https://chromium-review.googlesource.com/c/chromium/src/+/1379178
but I guess was missed.

Bug: 836549
Change-Id: I452b29f252cb6664281388ab5866ddad8005a48b
Reviewed-on: https://chromium-review.googlesource.com/c/1437702Reviewed-by: default avatarTommy Steimel <steimel@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: CJ DiMeglio <lethalantidote@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626315}
parent 3951e445
...@@ -62,9 +62,7 @@ AXObject* AccessibilityMediaControl::Create( ...@@ -62,9 +62,7 @@ AXObject* AccessibilityMediaControl::Create(
return AXMediaControlsContainer::Create(layout_object, ax_object_cache); return AXMediaControlsContainer::Create(layout_object, ax_object_cache);
case kMediaSliderThumb: case kMediaSliderThumb:
case kMediaTextTrackList:
case kMediaTimelineContainer: case kMediaTimelineContainer:
case kMediaTrackSelectionCheckmark:
case kMediaCastOffButton: case kMediaCastOffButton:
case kMediaCastOnButton: case kMediaCastOnButton:
case kMediaOverlayCastOffButton: case kMediaOverlayCastOffButton:
...@@ -123,9 +121,7 @@ String AccessibilityMediaControl::TextAlternative( ...@@ -123,9 +121,7 @@ String AccessibilityMediaControl::TextAlternative(
case kMediaOverflowButton: case kMediaOverflowButton:
return QueryString(WebLocalizedString::kAXMediaOverflowButton); return QueryString(WebLocalizedString::kAXMediaOverflowButton);
case kMediaSliderThumb: case kMediaSliderThumb:
case kMediaTextTrackList:
case kMediaTimelineContainer: case kMediaTimelineContainer:
case kMediaTrackSelectionCheckmark:
case kMediaControlsPanel: case kMediaControlsPanel:
case kMediaOverflowList: case kMediaOverflowList:
case kMediaScrubbingMessage: case kMediaScrubbingMessage:
...@@ -162,9 +158,7 @@ String AccessibilityMediaControl::Description( ...@@ -162,9 +158,7 @@ String AccessibilityMediaControl::Description(
case kMediaOverlayCastOnButton: case kMediaOverlayCastOnButton:
return ""; return "";
case kMediaSliderThumb: case kMediaSliderThumb:
case kMediaTextTrackList:
case kMediaTimelineContainer: case kMediaTimelineContainer:
case kMediaTrackSelectionCheckmark:
case kMediaControlsPanel: case kMediaControlsPanel:
case kMediaOverflowList: case kMediaOverflowList:
case kMediaScrubbingMessage: case kMediaScrubbingMessage:
...@@ -202,13 +196,11 @@ ax::mojom::Role AccessibilityMediaControl::RoleValue() const { ...@@ -202,13 +196,11 @@ ax::mojom::Role AccessibilityMediaControl::RoleValue() const {
return ax::mojom::Role::kButton; return ax::mojom::Role::kButton;
case kMediaTimelineContainer: case kMediaTimelineContainer:
case kMediaTextTrackList:
case kMediaOverflowList: case kMediaOverflowList:
return ax::mojom::Role::kGroup; return ax::mojom::Role::kGroup;
case kMediaControlsPanel: case kMediaControlsPanel:
case kMediaSliderThumb: case kMediaSliderThumb:
case kMediaTrackSelectionCheckmark:
case kMediaScrubbingMessage: case kMediaScrubbingMessage:
case kMediaAnimatedArrowContainer: case kMediaAnimatedArrowContainer:
return ax::mojom::Role::kUnknown; return ax::mojom::Role::kUnknown;
......
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
enum MediaControlElementType { enum MediaControlElementType {
kMediaSlider, kMediaSlider,
kMediaSliderThumb, kMediaSliderThumb,
kMediaTextTrackList,
kMediaTimelineContainer, kMediaTimelineContainer,
kMediaTrackSelectionCheckmark,
kMediaControlsPanel, kMediaControlsPanel,
kMediaCastOffButton, kMediaCastOffButton,
kMediaCastOnButton, kMediaCastOnButton,
......
...@@ -51,7 +51,7 @@ bool HasDuplicateLabel(TextTrack* current_track) { ...@@ -51,7 +51,7 @@ bool HasDuplicateLabel(TextTrack* current_track) {
MediaControlTextTrackListElement::MediaControlTextTrackListElement( MediaControlTextTrackListElement::MediaControlTextTrackListElement(
MediaControlsImpl& media_controls) MediaControlsImpl& media_controls)
: MediaControlPopupMenuElement(media_controls, kMediaTextTrackList) { : MediaControlPopupMenuElement(media_controls, kMediaIgnore) {
setAttribute(html_names::kRoleAttr, "menu"); setAttribute(html_names::kRoleAttr, "menu");
setAttribute(html_names::kAriaLabelAttr, setAttribute(html_names::kAriaLabelAttr,
WTF::AtomicString(GetLocale().QueryString( WTF::AtomicString(GetLocale().QueryString(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment