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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 2243473002: Adding overflow menu to media player (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 3 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 case WebLocalizedString::OtherColorLabel: 237 case WebLocalizedString::OtherColorLabel:
238 return IDS_FORM_OTHER_COLOR_LABEL; 238 return IDS_FORM_OTHER_COLOR_LABEL;
239 case WebLocalizedString::OtherDateLabel: 239 case WebLocalizedString::OtherDateLabel:
240 return IDS_FORM_OTHER_DATE_LABEL; 240 return IDS_FORM_OTHER_DATE_LABEL;
241 case WebLocalizedString::OtherMonthLabel: 241 case WebLocalizedString::OtherMonthLabel:
242 return IDS_FORM_OTHER_MONTH_LABEL; 242 return IDS_FORM_OTHER_MONTH_LABEL;
243 case WebLocalizedString::OtherTimeLabel: 243 case WebLocalizedString::OtherTimeLabel:
244 return IDS_FORM_OTHER_TIME_LABEL; 244 return IDS_FORM_OTHER_TIME_LABEL;
245 case WebLocalizedString::OtherWeekLabel: 245 case WebLocalizedString::OtherWeekLabel:
246 return IDS_FORM_OTHER_WEEK_LABEL; 246 return IDS_FORM_OTHER_WEEK_LABEL;
247 case WebLocalizedString::AxMediaOverflowButton:
248 return IDS_AX_MEDIA_OVERFLOW_BUTTON;
249 case WebLocalizedString::OverflowMenuCaptions:
250 return IDS_MEDIA_OVERFLOW_MENU_CLOSED_CAPTIONS;
251 case WebLocalizedString::OverflowMenuCast:
252 return IDS_MEDIA_OVERFLOW_MENU_CAST;
253 case WebLocalizedString::OverflowMenuEnterFullscreen:
254 return IDS_MEDIA_OVERFLOW_MENU_ENTER_FULLSCREEN;
255 case WebLocalizedString::OverflowMenuExitFullscreen:
256 return IDS_MEDIA_OVERFLOW_MENU_EXIT_FULLSCREEN;
257 case WebLocalizedString::OverflowMenuStopCast:
258 return IDS_MEDIA_OVERFLOW_MENU_STOP_CAST;
259 case WebLocalizedString::OverflowMenuMute:
260 return IDS_MEDIA_OVERFLOW_MENU_MUTE;
261 case WebLocalizedString::OverflowMenuUnmute:
262 return IDS_MEDIA_OVERFLOW_MENU_UNMUTE;
263 case WebLocalizedString::OverflowMenuPlay:
264 return IDS_MEDIA_OVERFLOW_MENU_PLAY;
265 case WebLocalizedString::OverflowMenuPause:
266 return IDS_MEDIA_OVERFLOW_MENU_PAUSE;
247 case WebLocalizedString::PlaceholderForDayOfMonthField: 267 case WebLocalizedString::PlaceholderForDayOfMonthField:
248 return IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD; 268 return IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD;
249 case WebLocalizedString::PlaceholderForMonthField: 269 case WebLocalizedString::PlaceholderForMonthField:
250 return IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD; 270 return IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD;
251 case WebLocalizedString::PlaceholderForYearField: 271 case WebLocalizedString::PlaceholderForYearField:
252 return IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD; 272 return IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD;
253 case WebLocalizedString::ResetButtonDefaultLabel: 273 case WebLocalizedString::ResetButtonDefaultLabel:
254 return IDS_FORM_RESET_LABEL; 274 return IDS_FORM_RESET_LABEL;
255 case WebLocalizedString::SearchableIndexIntroduction: 275 case WebLocalizedString::SearchableIndexIntroduction:
256 return IDS_SEARCHABLE_INDEX_INTRO; 276 return IDS_SEARCHABLE_INDEX_INTRO;
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 ui::SCALE_FACTOR_100P}, 639 ui::SCALE_FACTOR_100P},
620 {"mediaplayerClosedCaptionsIconNew", 640 {"mediaplayerClosedCaptionsIconNew",
621 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW, 641 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW,
622 ui::SCALE_FACTOR_100P}, 642 ui::SCALE_FACTOR_100P},
623 {"mediaplayerSubtitlesIcon", 643 {"mediaplayerSubtitlesIcon",
624 IDR_MEDIAPLAYER_SUBTITLES_ICON, 644 IDR_MEDIAPLAYER_SUBTITLES_ICON,
625 ui::SCALE_FACTOR_100P}, 645 ui::SCALE_FACTOR_100P},
626 {"mediaplayerSubtitlesIconNew", 646 {"mediaplayerSubtitlesIconNew",
627 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW, 647 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW,
628 ui::SCALE_FACTOR_100P}, 648 ui::SCALE_FACTOR_100P},
649 {"mediaplayerOverflowMenu",
650 IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON,
651 ui::SCALE_FACTOR_100P},
629 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, 652 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
630 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 653 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
631 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 654 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
632 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 655 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
633 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 656 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
634 {"generatePasswordHover", 657 {"generatePasswordHover",
635 IDR_PASSWORD_GENERATION_ICON_HOVER, 658 IDR_PASSWORD_GENERATION_ICON_HOVER,
636 ui::SCALE_FACTOR_100P}, 659 ui::SCALE_FACTOR_100P},
637 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, 660 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE},
638 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, 661 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE},
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 968 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
946 static_cast<ui::DomKey>(dom_key))); 969 static_cast<ui::DomKey>(dom_key)));
947 } 970 }
948 971
949 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 972 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
950 return static_cast<int>( 973 return static_cast<int>(
951 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 974 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
952 } 975 }
953 976
954 } // namespace content 977 } // namespace content
OLDNEW
« no previous file with comments | « content/app/strings/content_strings.grd ('k') | third_party/WebKit/LayoutTests/TestExpectations » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698