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

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 comments from fs Created 4 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 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 case WebLocalizedString::ValidationValueMissingForMultipleFile: 327 case WebLocalizedString::ValidationValueMissingForMultipleFile:
328 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE; 328 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE;
329 case WebLocalizedString::ValidationValueMissingForRadio: 329 case WebLocalizedString::ValidationValueMissingForRadio:
330 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO; 330 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO;
331 case WebLocalizedString::ValidationValueMissingForSelect: 331 case WebLocalizedString::ValidationValueMissingForSelect:
332 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT; 332 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT;
333 case WebLocalizedString::WeekFormatTemplate: 333 case WebLocalizedString::WeekFormatTemplate:
334 return IDS_FORM_INPUT_WEEK_TEMPLATE; 334 return IDS_FORM_INPUT_WEEK_TEMPLATE;
335 case WebLocalizedString::WeekNumberLabel: 335 case WebLocalizedString::WeekNumberLabel:
336 return IDS_FORM_WEEK_NUMBER_LABEL; 336 return IDS_FORM_WEEK_NUMBER_LABEL;
337 case WebLocalizedString::TextTracksNoLabel:
338 return IDS_MEDIA_TRACKS_NO_LABEL;
339 case WebLocalizedString::TextTracksOff:
340 return IDS_MEDIA_TRACKS_OFF;
337 // This "default:" line exists to avoid compile warnings about enum 341 // This "default:" line exists to avoid compile warnings about enum
338 // coverage when we add a new symbol to WebLocalizedString.h in WebKit. 342 // coverage when we add a new symbol to WebLocalizedString.h in WebKit.
339 // After a planned WebKit patch is landed, we need to add a case statement 343 // After a planned WebKit patch is landed, we need to add a case statement
340 // for the added symbol here. 344 // for the added symbol here.
341 default: 345 default:
342 break; 346 break;
343 } 347 }
344 return -1; 348 return -1;
345 } 349 }
346 350
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 ui::SCALE_FACTOR_100P}, 701 ui::SCALE_FACTOR_100P},
698 {"mediaplayerOverlayCastOffNew", 702 {"mediaplayerOverlayCastOffNew",
699 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW, 703 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW,
700 ui::SCALE_FACTOR_100P}, 704 ui::SCALE_FACTOR_100P},
701 {"mediaplayerOverlayPlay", 705 {"mediaplayerOverlayPlay",
702 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, 706 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
703 ui::SCALE_FACTOR_100P}, 707 ui::SCALE_FACTOR_100P},
704 {"mediaplayerOverlayPlayNew", 708 {"mediaplayerOverlayPlayNew",
705 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW, 709 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW,
706 ui::SCALE_FACTOR_100P}, 710 ui::SCALE_FACTOR_100P},
711 {"mediaplayerTrackSelectionCheckmark",
712 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK,
713 ui::SCALE_FACTOR_100P},
714 {"mediaplayerTrackSelectionCheckmarkNew",
715 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW,
716 ui::SCALE_FACTOR_100P},
717 {"mediaplayerClosedCaptionsIcon",
718 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
719 ui::SCALE_FACTOR_100P},
720 {"mediaplayerClosedCaptionsIconNew",
721 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW,
722 ui::SCALE_FACTOR_100P},
723 {"mediaplayerSubtitlesIcon",
724 IDR_MEDIAPLAYER_SUBTITLES_ICON,
725 ui::SCALE_FACTOR_100P},
726 {"mediaplayerSubtitlesIconNew",
727 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW,
728 ui::SCALE_FACTOR_100P},
707 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, 729 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
708 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 730 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
709 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P}, 731 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P},
710 {"searchMagnifierResults", 732 {"searchMagnifierResults",
711 IDR_SEARCH_MAGNIFIER_RESULTS, 733 IDR_SEARCH_MAGNIFIER_RESULTS,
712 ui::SCALE_FACTOR_100P}, 734 ui::SCALE_FACTOR_100P},
713 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 735 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
714 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 736 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
715 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 737 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
716 {"generatePasswordHover", 738 {"generatePasswordHover",
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 1063 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
1042 static_cast<ui::DomKey>(dom_key))); 1064 static_cast<ui::DomKey>(dom_key)));
1043 } 1065 }
1044 1066
1045 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 1067 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
1046 return static_cast<int>( 1068 return static_cast<int>(
1047 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 1069 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
1048 } 1070 }
1049 1071
1050 } // namespace content 1072 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698