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

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: Created 4 years, 4 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 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 ui::SCALE_FACTOR_100P}, 657 ui::SCALE_FACTOR_100P},
658 {"mediaplayerClosedCaptionsIconNew", 658 {"mediaplayerClosedCaptionsIconNew",
659 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW, 659 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW,
660 ui::SCALE_FACTOR_100P}, 660 ui::SCALE_FACTOR_100P},
661 {"mediaplayerSubtitlesIcon", 661 {"mediaplayerSubtitlesIcon",
662 IDR_MEDIAPLAYER_SUBTITLES_ICON, 662 IDR_MEDIAPLAYER_SUBTITLES_ICON,
663 ui::SCALE_FACTOR_100P}, 663 ui::SCALE_FACTOR_100P},
664 {"mediaplayerSubtitlesIconNew", 664 {"mediaplayerSubtitlesIconNew",
665 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW, 665 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW,
666 ui::SCALE_FACTOR_100P}, 666 ui::SCALE_FACTOR_100P},
667 {"mediaplayerOverflowMenu",
668 IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON,
669 ui::SCALE_FACTOR_100P},
667 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, 670 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
668 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 671 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
669 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 672 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
670 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 673 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
671 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 674 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
672 {"generatePasswordHover", 675 {"generatePasswordHover",
673 IDR_PASSWORD_GENERATION_ICON_HOVER, 676 IDR_PASSWORD_GENERATION_ICON_HOVER,
674 ui::SCALE_FACTOR_100P}, 677 ui::SCALE_FACTOR_100P},
675 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, 678 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE},
676 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, 679 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE},
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 985 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
983 static_cast<ui::DomKey>(dom_key))); 986 static_cast<ui::DomKey>(dom_key)));
984 } 987 }
985 988
986 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 989 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
987 return static_cast<int>( 990 return static_cast<int>(
988 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 991 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
989 } 992 }
990 993
991 } // namespace content 994 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698