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

Side by Side Diff: components/html_viewer/blink_resource_constants.h

Issue 1079323002: Support text track selection in video controls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Blink repo changes and addressed comments from philipj and UX Created 4 years, 10 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef COMPONENTS_HTML_VIEWER_BLINK_RESOURCE_CONSTANTS_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_BLINK_RESOURCE_CONSTANTS_H_
6 #define COMPONENTS_HTML_VIEWER_BLINK_RESOURCE_CONSTANTS_H_ 6 #define COMPONENTS_HTML_VIEWER_BLINK_RESOURCE_CONSTANTS_H_
7 7
8 #include "blink/public/resources/grit/blink_image_resources.h" 8 #include "blink/public/resources/grit/blink_image_resources.h"
9 #include "blink/public/resources/grit/blink_resources.h" 9 #include "blink/public/resources/grit/blink_resources.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 26 matching lines...) Expand all
37 {"mediaplayerVolumeSliderThumbNew", 37 {"mediaplayerVolumeSliderThumbNew",
38 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW}, 38 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW},
39 {"mediaplayerVolumeSliderThumbDisabled", 39 {"mediaplayerVolumeSliderThumbDisabled",
40 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED}, 40 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED},
41 {"mediaplayerClosedCaption", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON}, 41 {"mediaplayerClosedCaption", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON},
42 {"mediaplayerClosedCaptionNew", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW}, 42 {"mediaplayerClosedCaptionNew", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW},
43 {"mediaplayerClosedCaptionDisabled", 43 {"mediaplayerClosedCaptionDisabled",
44 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED}, 44 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED},
45 {"mediaplayerClosedCaptionDisabledNew", 45 {"mediaplayerClosedCaptionDisabledNew",
46 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW}, 46 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW},
47 {"mediaplayerClosedCaptionsIcon", IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON},
msw 2016/02/23 18:17:01 This file no longer exists, please sync and rebase
48 {"mediaplayerClosedCaptionsIconNew",
49 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW},
47 {"mediaplayerEnterFullscreen", IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON}, 50 {"mediaplayerEnterFullscreen", IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON},
48 {"mediaplayerFullscreen", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON}, 51 {"mediaplayerFullscreen", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON},
49 {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF}, 52 {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF},
50 {"mediaplayerCastOffNew", IDR_MEDIAPLAYER_CAST_BUTTON_OFF_NEW}, 53 {"mediaplayerCastOffNew", IDR_MEDIAPLAYER_CAST_BUTTON_OFF_NEW},
51 {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON}, 54 {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON},
52 {"mediaplayerCastOnNew", IDR_MEDIAPLAYER_CAST_BUTTON_ON_NEW}, 55 {"mediaplayerCastOnNew", IDR_MEDIAPLAYER_CAST_BUTTON_ON_NEW},
53 {"mediaplayerFullscreenDisabled", 56 {"mediaplayerFullscreenDisabled",
54 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED}, 57 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED},
55 {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF}, 58 {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF},
56 {"mediaplayerOverlayCastOffNew", 59 {"mediaplayerOverlayCastOffNew",
57 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW}, 60 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW},
58 {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON}, 61 {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON},
59 {"mediaplayerOverlayPlayNew", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW}, 62 {"mediaplayerOverlayPlayNew", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW},
63 {"mediaplayerSubtitlesIcon", IDR_MEDIAPLAYER_SUBTITLES_ICON},
64 {"mediaplayerSubtitlesIconNew", IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW},
65 {"mediaplayerTrackSelectionCheckmark",
66 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK},
67 {"mediaplayerTrackSelectionCheckmarkNew",
68 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW},
60 {"searchCancel", IDR_SEARCH_CANCEL}, 69 {"searchCancel", IDR_SEARCH_CANCEL},
61 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED}, 70 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED},
62 {"searchMagnifier", IDR_SEARCH_MAGNIFIER}, 71 {"searchMagnifier", IDR_SEARCH_MAGNIFIER},
63 {"searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS}, 72 {"searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS},
64 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER}, 73 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER},
65 // Skipping "textAreaResizeCorner@2x" 74 // Skipping "textAreaResizeCorner@2x"
66 {"generatePassword", IDR_PASSWORD_GENERATION_ICON}, 75 {"generatePassword", IDR_PASSWORD_GENERATION_ICON},
67 {"generatePasswordHover", IDR_PASSWORD_GENERATION_ICON_HOVER}, 76 {"generatePasswordHover", IDR_PASSWORD_GENERATION_ICON_HOVER},
68 {"html.css", IDR_UASTYLE_HTML_CSS}, 77 {"html.css", IDR_UASTYLE_HTML_CSS},
69 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS}, 78 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS},
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 {"suggestionPicker.js", IDR_SUGGESTION_PICKER_JS}, 114 {"suggestionPicker.js", IDR_SUGGESTION_PICKER_JS},
106 {"suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS}, 115 {"suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS},
107 {"colorSuggestionPicker.js", IDR_COLOR_SUGGESTION_PICKER_JS}, 116 {"colorSuggestionPicker.js", IDR_COLOR_SUGGESTION_PICKER_JS},
108 {"colorSuggestionPicker.css", IDR_COLOR_SUGGESTION_PICKER_CSS} 117 {"colorSuggestionPicker.css", IDR_COLOR_SUGGESTION_PICKER_CSS}
109 #endif 118 #endif
110 }; 119 };
111 120
112 } // namespace html_viewer 121 } // namespace html_viewer
113 122
114 #endif // COMPONENTS_HTML_VIEWER_BLINK_RESOURCE_CONSTANTS_H_ 123 #endif // COMPONENTS_HTML_VIEWER_BLINK_RESOURCE_CONSTANTS_H_
OLDNEW
« no previous file with comments | « no previous file | content/app/strings/content_strings.grd » ('j') | third_party/WebKit/LayoutTests/media/media-controls.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698