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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 1079323002: Support text track selection in video controls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed UX comment on displaying icons only for duplicate labels and rebase Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/child/blink_platform_impl.h" 5 #include "content/child/blink_platform_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 case WebLocalizedString::ValidationValueMissingForMultipleFile: 330 case WebLocalizedString::ValidationValueMissingForMultipleFile:
331 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE; 331 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE;
332 case WebLocalizedString::ValidationValueMissingForRadio: 332 case WebLocalizedString::ValidationValueMissingForRadio:
333 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO; 333 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO;
334 case WebLocalizedString::ValidationValueMissingForSelect: 334 case WebLocalizedString::ValidationValueMissingForSelect:
335 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT; 335 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT;
336 case WebLocalizedString::WeekFormatTemplate: 336 case WebLocalizedString::WeekFormatTemplate:
337 return IDS_FORM_INPUT_WEEK_TEMPLATE; 337 return IDS_FORM_INPUT_WEEK_TEMPLATE;
338 case WebLocalizedString::WeekNumberLabel: 338 case WebLocalizedString::WeekNumberLabel:
339 return IDS_FORM_WEEK_NUMBER_LABEL; 339 return IDS_FORM_WEEK_NUMBER_LABEL;
340 case WebLocalizedString::TextTracksNoLabel:
341 return IDS_MEDIA_TRACKS_NO_LABEL;
342 case WebLocalizedString::TextTracksOff:
343 return IDS_MEDIA_TRACKS_OFF;
340 // This "default:" line exists to avoid compile warnings about enum 344 // This "default:" line exists to avoid compile warnings about enum
341 // coverage when we add a new symbol to WebLocalizedString.h in WebKit. 345 // coverage when we add a new symbol to WebLocalizedString.h in WebKit.
342 // After a planned WebKit patch is landed, we need to add a case statement 346 // After a planned WebKit patch is landed, we need to add a case statement
343 // for the added symbol here. 347 // for the added symbol here.
344 default: 348 default:
345 break; 349 break;
346 } 350 }
347 return -1; 351 return -1;
348 } 352 }
349 353
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 ui::SCALE_FACTOR_100P}, 685 ui::SCALE_FACTOR_100P},
682 {"mediaplayerOverlayCastOffNew", 686 {"mediaplayerOverlayCastOffNew",
683 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW, 687 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW,
684 ui::SCALE_FACTOR_100P}, 688 ui::SCALE_FACTOR_100P},
685 {"mediaplayerOverlayPlay", 689 {"mediaplayerOverlayPlay",
686 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, 690 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
687 ui::SCALE_FACTOR_100P}, 691 ui::SCALE_FACTOR_100P},
688 {"mediaplayerOverlayPlayNew", 692 {"mediaplayerOverlayPlayNew",
689 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW, 693 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW,
690 ui::SCALE_FACTOR_100P}, 694 ui::SCALE_FACTOR_100P},
695 {"mediaplayerTrackSelectionCheckmark",
696 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK,
697 ui::SCALE_FACTOR_100P},
698 {"mediaplayerTrackSelectionCheckmarkNew",
699 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW,
700 ui::SCALE_FACTOR_100P},
701 {"mediaplayerClosedCaptionsIcon",
702 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
703 ui::SCALE_FACTOR_100P},
704 {"mediaplayerClosedCaptionsIconNew",
705 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW,
706 ui::SCALE_FACTOR_100P},
707 {"mediaplayerSubtitlesIcon",
708 IDR_MEDIAPLAYER_SUBTITLES_ICON,
709 ui::SCALE_FACTOR_100P},
710 {"mediaplayerSubtitlesIconNew",
711 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW,
712 ui::SCALE_FACTOR_100P},
691 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, 713 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
692 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 714 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
693 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P}, 715 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P},
694 {"searchMagnifierResults", 716 {"searchMagnifierResults",
695 IDR_SEARCH_MAGNIFIER_RESULTS, 717 IDR_SEARCH_MAGNIFIER_RESULTS,
696 ui::SCALE_FACTOR_100P}, 718 ui::SCALE_FACTOR_100P},
697 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 719 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
698 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 720 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
699 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 721 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
700 {"generatePasswordHover", 722 {"generatePasswordHover",
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 1037 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
1016 static_cast<ui::DomKey>(dom_key))); 1038 static_cast<ui::DomKey>(dom_key)));
1017 } 1039 }
1018 1040
1019 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 1041 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
1020 return static_cast<int>( 1042 return static_cast<int>(
1021 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 1043 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
1022 } 1044 }
1023 1045
1024 } // namespace content 1046 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698