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

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: Created 5 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 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 case WebLocalizedString::ValidationValueMissingForMultipleFile: 397 case WebLocalizedString::ValidationValueMissingForMultipleFile:
398 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE; 398 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE;
399 case WebLocalizedString::ValidationValueMissingForRadio: 399 case WebLocalizedString::ValidationValueMissingForRadio:
400 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO; 400 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO;
401 case WebLocalizedString::ValidationValueMissingForSelect: 401 case WebLocalizedString::ValidationValueMissingForSelect:
402 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT; 402 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT;
403 case WebLocalizedString::WeekFormatTemplate: 403 case WebLocalizedString::WeekFormatTemplate:
404 return IDS_FORM_INPUT_WEEK_TEMPLATE; 404 return IDS_FORM_INPUT_WEEK_TEMPLATE;
405 case WebLocalizedString::WeekNumberLabel: 405 case WebLocalizedString::WeekNumberLabel:
406 return IDS_FORM_WEEK_NUMBER_LABEL; 406 return IDS_FORM_WEEK_NUMBER_LABEL;
407 case WebLocalizedString::TextTracksNoLabel:
408 return IDS_MEDIA_TRACKS_NO_LABEL;
409 case WebLocalizedString::TextTracksOff:
410 return IDS_MEDIA_TRACKS_OFF;
411 case WebLocalizedString::TextTracksSubtitlesCC:
412 return IDS_MEDIA_TRACKS_SUBTITLES_CC;
413 case WebLocalizedString::TextTracksCaptionsMarker:
414 return IDS_MEDIA_TRACKS_CAPTIONS_MARKER;
407 // This "default:" line exists to avoid compile warnings about enum 415 // This "default:" line exists to avoid compile warnings about enum
408 // coverage when we add a new symbol to WebLocalizedString.h in WebKit. 416 // coverage when we add a new symbol to WebLocalizedString.h in WebKit.
409 // After a planned WebKit patch is landed, we need to add a case statement 417 // After a planned WebKit patch is landed, we need to add a case statement
410 // for the added symbol here. 418 // for the added symbol here.
411 default: 419 default:
412 break; 420 break;
413 } 421 }
414 return -1; 422 return -1;
415 } 423 }
416 424
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 ui::SCALE_FACTOR_100P}, 855 ui::SCALE_FACTOR_100P},
848 {"mediaplayerFullscreenDisabled", 856 {"mediaplayerFullscreenDisabled",
849 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, 857 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED,
850 ui::SCALE_FACTOR_100P}, 858 ui::SCALE_FACTOR_100P},
851 {"mediaplayerOverlayCastOff", 859 {"mediaplayerOverlayCastOff",
852 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, 860 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
853 ui::SCALE_FACTOR_100P}, 861 ui::SCALE_FACTOR_100P},
854 {"mediaplayerOverlayPlay", 862 {"mediaplayerOverlayPlay",
855 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, 863 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
856 ui::SCALE_FACTOR_100P}, 864 ui::SCALE_FACTOR_100P},
865 { "mediaplayerTrackSelectionCheckmark",
Avi (use Gerrit) 2015/04/13 21:10:39 No space after { to match context
srivats 2015/04/16 23:39:27 Done.
866 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK,
867 ui::SCALE_FACTOR_100P},
857 {"panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P}, 868 {"panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P},
858 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, 869 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
859 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 870 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
860 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P}, 871 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P},
861 {"searchMagnifierResults", 872 {"searchMagnifierResults",
862 IDR_SEARCH_MAGNIFIER_RESULTS, 873 IDR_SEARCH_MAGNIFIER_RESULTS,
863 ui::SCALE_FACTOR_100P}, 874 ui::SCALE_FACTOR_100P},
864 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 875 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
865 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 876 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
866 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 877 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( 1332 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString(
1322 static_cast<ui::DomCode>(dom_code))); 1333 static_cast<ui::DomCode>(dom_code)));
1323 } 1334 }
1324 1335
1325 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { 1336 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) {
1326 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( 1337 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode(
1327 code.utf8().data())); 1338 code.utf8().data()));
1328 } 1339 }
1329 1340
1330 } // namespace content 1341 } // namespace content
OLDNEW
« no previous file with comments | « content/app/strings/content_strings.grd ('k') | mojo/services/html_viewer/blink_resource_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698