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

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: Rebase and Philip's comments 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 <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 ui::SCALE_FACTOR_100P}, 676 ui::SCALE_FACTOR_100P},
673 {"mediaplayerOverlayCastOffNew", 677 {"mediaplayerOverlayCastOffNew",
674 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW, 678 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW,
675 ui::SCALE_FACTOR_100P}, 679 ui::SCALE_FACTOR_100P},
676 {"mediaplayerOverlayPlay", 680 {"mediaplayerOverlayPlay",
677 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, 681 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
678 ui::SCALE_FACTOR_100P}, 682 ui::SCALE_FACTOR_100P},
679 {"mediaplayerOverlayPlayNew", 683 {"mediaplayerOverlayPlayNew",
680 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW, 684 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW,
681 ui::SCALE_FACTOR_100P}, 685 ui::SCALE_FACTOR_100P},
686 {"mediaplayerTrackSelectionCheckmark",
687 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK,
688 ui::SCALE_FACTOR_100P},
689 {"mediaplayerTrackSelectionCheckmarkNew",
690 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW,
691 ui::SCALE_FACTOR_100P},
692 {"mediaplayerClosedCaptionsIcon",
693 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
694 ui::SCALE_FACTOR_100P},
695 {"mediaplayerClosedCaptionsIconNew",
696 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW,
697 ui::SCALE_FACTOR_100P},
698 {"mediaplayerSubtitlesIcon",
699 IDR_MEDIAPLAYER_SUBTITLES_ICON,
700 ui::SCALE_FACTOR_100P},
701 {"mediaplayerSubtitlesIconNew",
702 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW,
703 ui::SCALE_FACTOR_100P},
682 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, 704 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
683 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 705 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
684 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P}, 706 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P},
685 {"searchMagnifierResults", 707 {"searchMagnifierResults",
686 IDR_SEARCH_MAGNIFIER_RESULTS, 708 IDR_SEARCH_MAGNIFIER_RESULTS,
687 ui::SCALE_FACTOR_100P}, 709 ui::SCALE_FACTOR_100P},
688 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 710 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
689 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 711 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
690 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 712 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
691 {"generatePasswordHover", 713 {"generatePasswordHover",
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 1030 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
1009 static_cast<ui::DomKey>(dom_key))); 1031 static_cast<ui::DomKey>(dom_key)));
1010 } 1032 }
1011 1033
1012 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 1034 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
1013 return static_cast<int>( 1035 return static_cast<int>(
1014 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 1036 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
1015 } 1037 }
1016 1038
1017 } // namespace content 1039 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698