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

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: Updated track menu header to Subtitles 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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 case WebLocalizedString::ValidationValueMissingForMultipleFile: 398 case WebLocalizedString::ValidationValueMissingForMultipleFile:
399 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE; 399 return IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE;
400 case WebLocalizedString::ValidationValueMissingForRadio: 400 case WebLocalizedString::ValidationValueMissingForRadio:
401 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO; 401 return IDS_FORM_VALIDATION_VALUE_MISSING_RADIO;
402 case WebLocalizedString::ValidationValueMissingForSelect: 402 case WebLocalizedString::ValidationValueMissingForSelect:
403 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT; 403 return IDS_FORM_VALIDATION_VALUE_MISSING_SELECT;
404 case WebLocalizedString::WeekFormatTemplate: 404 case WebLocalizedString::WeekFormatTemplate:
405 return IDS_FORM_INPUT_WEEK_TEMPLATE; 405 return IDS_FORM_INPUT_WEEK_TEMPLATE;
406 case WebLocalizedString::WeekNumberLabel: 406 case WebLocalizedString::WeekNumberLabel:
407 return IDS_FORM_WEEK_NUMBER_LABEL; 407 return IDS_FORM_WEEK_NUMBER_LABEL;
408 case WebLocalizedString::TextTracksNoLabel:
409 return IDS_MEDIA_TRACKS_NO_LABEL;
410 case WebLocalizedString::TextTracksOff:
411 return IDS_MEDIA_TRACKS_OFF;
412 case WebLocalizedString::TextTracksSubtitles:
413 return IDS_MEDIA_TRACKS_SUBTITLES;
414 case WebLocalizedString::TextTracksCaptionsMarker:
415 return IDS_MEDIA_TRACKS_CAPTIONS_MARKER;
408 // This "default:" line exists to avoid compile warnings about enum 416 // This "default:" line exists to avoid compile warnings about enum
409 // coverage when we add a new symbol to WebLocalizedString.h in WebKit. 417 // coverage when we add a new symbol to WebLocalizedString.h in WebKit.
410 // After a planned WebKit patch is landed, we need to add a case statement 418 // After a planned WebKit patch is landed, we need to add a case statement
411 // for the added symbol here. 419 // for the added symbol here.
412 default: 420 default:
413 break; 421 break;
414 } 422 }
415 return -1; 423 return -1;
416 } 424 }
417 425
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 ui::SCALE_FACTOR_100P}, 869 ui::SCALE_FACTOR_100P},
862 {"mediaplayerFullscreenDisabled", 870 {"mediaplayerFullscreenDisabled",
863 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, 871 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED,
864 ui::SCALE_FACTOR_100P}, 872 ui::SCALE_FACTOR_100P},
865 {"mediaplayerOverlayCastOff", 873 {"mediaplayerOverlayCastOff",
866 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, 874 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
867 ui::SCALE_FACTOR_100P}, 875 ui::SCALE_FACTOR_100P},
868 {"mediaplayerOverlayPlay", 876 {"mediaplayerOverlayPlay",
869 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, 877 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
870 ui::SCALE_FACTOR_100P}, 878 ui::SCALE_FACTOR_100P},
879 {"mediaplayerTrackSelectionCheckmark",
philipj_slow 2015/04/23 13:53:37 Is there a bitmap to go with this too?
philipj_slow 2015/04/23 14:02:45 Oh, it's in https://codereview.chromium.org/108253
880 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK,
881 ui::SCALE_FACTOR_100P},
871 {"panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P}, 882 {"panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P},
872 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, 883 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
873 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 884 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
874 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P}, 885 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P},
875 {"searchMagnifierResults", 886 {"searchMagnifierResults",
876 IDR_SEARCH_MAGNIFIER_RESULTS, 887 IDR_SEARCH_MAGNIFIER_RESULTS,
877 ui::SCALE_FACTOR_100P}, 888 ui::SCALE_FACTOR_100P},
878 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 889 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
879 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 890 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
880 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 891 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( 1343 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString(
1333 static_cast<ui::DomCode>(dom_code))); 1344 static_cast<ui::DomCode>(dom_code)));
1334 } 1345 }
1335 1346
1336 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { 1347 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) {
1337 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( 1348 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode(
1338 code.utf8().data())); 1349 code.utf8().data()));
1339 } 1350 }
1340 1351
1341 } // namespace content 1352 } // 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