| OLD | NEW |
| 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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 669 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW, | 669 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW, |
| 670 ui::SCALE_FACTOR_100P}, | 670 ui::SCALE_FACTOR_100P}, |
| 671 {"mediaplayerSubtitlesIcon", | 671 {"mediaplayerSubtitlesIcon", |
| 672 IDR_MEDIAPLAYER_SUBTITLES_ICON, | 672 IDR_MEDIAPLAYER_SUBTITLES_ICON, |
| 673 ui::SCALE_FACTOR_100P}, | 673 ui::SCALE_FACTOR_100P}, |
| 674 {"mediaplayerSubtitlesIconNew", | 674 {"mediaplayerSubtitlesIconNew", |
| 675 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW, | 675 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW, |
| 676 ui::SCALE_FACTOR_100P}, | 676 ui::SCALE_FACTOR_100P}, |
| 677 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, | 677 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, |
| 678 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, | 678 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, |
| 679 {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P}, | |
| 680 {"searchMagnifierResults", | |
| 681 IDR_SEARCH_MAGNIFIER_RESULTS, | |
| 682 ui::SCALE_FACTOR_100P}, | |
| 683 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, | 679 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, |
| 684 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, | 680 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, |
| 685 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, | 681 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, |
| 686 {"generatePasswordHover", | 682 {"generatePasswordHover", |
| 687 IDR_PASSWORD_GENERATION_ICON_HOVER, | 683 IDR_PASSWORD_GENERATION_ICON_HOVER, |
| 688 ui::SCALE_FACTOR_100P}, | 684 ui::SCALE_FACTOR_100P}, |
| 689 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, | 685 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, |
| 690 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, | 686 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, |
| 691 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE}, | 687 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE}, |
| 692 #if defined(OS_ANDROID) | 688 #if defined(OS_ANDROID) |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1004 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( | 1000 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( |
| 1005 static_cast<ui::DomKey>(dom_key))); | 1001 static_cast<ui::DomKey>(dom_key))); |
| 1006 } | 1002 } |
| 1007 | 1003 |
| 1008 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { | 1004 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { |
| 1009 return static_cast<int>( | 1005 return static_cast<int>( |
| 1010 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); | 1006 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); |
| 1011 } | 1007 } |
| 1012 | 1008 |
| 1013 } // namespace content | 1009 } // namespace content |
| OLD | NEW |