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

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: added more tests 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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 case WebLocalizedString::OtherColorLabel: 239 case WebLocalizedString::OtherColorLabel:
240 return IDS_FORM_OTHER_COLOR_LABEL; 240 return IDS_FORM_OTHER_COLOR_LABEL;
241 case WebLocalizedString::OtherDateLabel: 241 case WebLocalizedString::OtherDateLabel:
242 return IDS_FORM_OTHER_DATE_LABEL; 242 return IDS_FORM_OTHER_DATE_LABEL;
243 case WebLocalizedString::OtherMonthLabel: 243 case WebLocalizedString::OtherMonthLabel:
244 return IDS_FORM_OTHER_MONTH_LABEL; 244 return IDS_FORM_OTHER_MONTH_LABEL;
245 case WebLocalizedString::OtherTimeLabel: 245 case WebLocalizedString::OtherTimeLabel:
246 return IDS_FORM_OTHER_TIME_LABEL; 246 return IDS_FORM_OTHER_TIME_LABEL;
247 case WebLocalizedString::OtherWeekLabel: 247 case WebLocalizedString::OtherWeekLabel:
248 return IDS_FORM_OTHER_WEEK_LABEL; 248 return IDS_FORM_OTHER_WEEK_LABEL;
249 case WebLocalizedString::AxMediaOverflowButton:
250 return IDS_AX_MEDIA_OVERFLOW_BUTTON;
251 case WebLocalizedString::OverflowMenuCaptions:
252 return IDS_MEDIA_OVERFLOW_MENU_CAPTIONS;
253 case WebLocalizedString::OverflowMenuCast:
254 return IDS_MEDIA_OVERFLOW_MENU_CAST;
255 case WebLocalizedString::OverflowMenuFullscreen:
256 return IDS_MEDIA_OVERFLOW_MENU_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;
249 case WebLocalizedString::PlaceholderForDayOfMonthField: 263 case WebLocalizedString::PlaceholderForDayOfMonthField:
250 return IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD; 264 return IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD;
251 case WebLocalizedString::PlaceholderForMonthField: 265 case WebLocalizedString::PlaceholderForMonthField:
252 return IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD; 266 return IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD;
253 case WebLocalizedString::PlaceholderForYearField: 267 case WebLocalizedString::PlaceholderForYearField:
254 return IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD; 268 return IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD;
255 case WebLocalizedString::ResetButtonDefaultLabel: 269 case WebLocalizedString::ResetButtonDefaultLabel:
256 return IDS_FORM_RESET_LABEL; 270 return IDS_FORM_RESET_LABEL;
257 case WebLocalizedString::SearchableIndexIntroduction: 271 case WebLocalizedString::SearchableIndexIntroduction:
258 return IDS_SEARCHABLE_INDEX_INTRO; 272 return IDS_SEARCHABLE_INDEX_INTRO;
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 ui::SCALE_FACTOR_100P}, 635 ui::SCALE_FACTOR_100P},
622 {"mediaplayerClosedCaptionsIconNew", 636 {"mediaplayerClosedCaptionsIconNew",
623 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW, 637 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW,
624 ui::SCALE_FACTOR_100P}, 638 ui::SCALE_FACTOR_100P},
625 {"mediaplayerSubtitlesIcon", 639 {"mediaplayerSubtitlesIcon",
626 IDR_MEDIAPLAYER_SUBTITLES_ICON, 640 IDR_MEDIAPLAYER_SUBTITLES_ICON,
627 ui::SCALE_FACTOR_100P}, 641 ui::SCALE_FACTOR_100P},
628 {"mediaplayerSubtitlesIconNew", 642 {"mediaplayerSubtitlesIconNew",
629 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW, 643 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW,
630 ui::SCALE_FACTOR_100P}, 644 ui::SCALE_FACTOR_100P},
645 {"mediaplayerOverflowMenu",
646 IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON,
647 ui::SCALE_FACTOR_100P},
631 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, 648 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
632 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 649 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
633 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 650 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
634 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 651 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
635 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 652 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
636 {"generatePasswordHover", 653 {"generatePasswordHover",
637 IDR_PASSWORD_GENERATION_ICON_HOVER, 654 IDR_PASSWORD_GENERATION_ICON_HOVER,
638 ui::SCALE_FACTOR_100P}, 655 ui::SCALE_FACTOR_100P},
639 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, 656 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE},
640 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, 657 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE},
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 963 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
947 static_cast<ui::DomKey>(dom_key))); 964 static_cast<ui::DomKey>(dom_key)));
948 } 965 }
949 966
950 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 967 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
951 return static_cast<int>( 968 return static_cast<int>(
952 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 969 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
953 } 970 }
954 971
955 } // namespace content 972 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698