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

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

Issue 2291883002: Fix missing style includes when inspector is used to force mobile. (Closed)
Patch Set: Fix grd file. 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
« no previous file with comments | « no previous file | third_party/WebKit/public/blink_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, 632 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
633 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, 633 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
634 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, 634 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
635 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, 635 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
636 {"generatePasswordHover", 636 {"generatePasswordHover",
637 IDR_PASSWORD_GENERATION_ICON_HOVER, 637 IDR_PASSWORD_GENERATION_ICON_HOVER,
638 ui::SCALE_FACTOR_100P}, 638 ui::SCALE_FACTOR_100P},
639 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, 639 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE},
640 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, 640 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE},
641 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE}, 641 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE},
642 #if defined(OS_ANDROID) 642 // Not limited to Android since it's used for mobile layouts in inspector.
643 {"themeChromiumAndroid.css", 643 {"themeChromiumAndroid.css",
644 IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS, 644 IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS,
645 ui::SCALE_FACTOR_NONE}, 645 ui::SCALE_FACTOR_NONE},
646 // Not limited to Android since it's used for mobile layouts in inspector.
646 {"fullscreenAndroid.css", 647 {"fullscreenAndroid.css",
647 IDR_UASTYLE_FULLSCREEN_ANDROID_CSS, 648 IDR_UASTYLE_FULLSCREEN_ANDROID_CSS,
648 ui::SCALE_FACTOR_NONE}, 649 ui::SCALE_FACTOR_NONE},
650 // Not limited to Android since it's used for mobile layouts in inspector.
649 {"mediaControlsAndroid.css", 651 {"mediaControlsAndroid.css",
650 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS, 652 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS,
651 ui::SCALE_FACTOR_NONE}, 653 ui::SCALE_FACTOR_NONE},
654 // Not limited to Android since it's used for mobile layouts in inspector.
652 {"mediaControlsAndroidNew.css", 655 {"mediaControlsAndroidNew.css",
653 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS, 656 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS,
654 ui::SCALE_FACTOR_NONE}, 657 ui::SCALE_FACTOR_NONE},
655 #endif 658 // Not limited to Linux since it's used for mobile layouts in inspector.
656 #if !defined(OS_WIN)
657 {"themeChromiumLinux.css", 659 {"themeChromiumLinux.css",
658 IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS, 660 IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS,
659 ui::SCALE_FACTOR_NONE}, 661 ui::SCALE_FACTOR_NONE},
660 #endif
661 {"themeInputMultipleFields.css", 662 {"themeInputMultipleFields.css",
662 IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS, 663 IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS,
663 ui::SCALE_FACTOR_NONE}, 664 ui::SCALE_FACTOR_NONE},
664 #if defined(OS_MACOSX) 665 #if defined(OS_MACOSX)
665 {"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE}, 666 {"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE},
666 #endif 667 #endif
667 {"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE}, 668 {"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE},
668 {"themeWinQuirks.css", 669 {"themeWinQuirks.css",
669 IDR_UASTYLE_THEME_WIN_QUIRKS_CSS, 670 IDR_UASTYLE_THEME_WIN_QUIRKS_CSS,
670 ui::SCALE_FACTOR_NONE}, 671 ui::SCALE_FACTOR_NONE},
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 947 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
947 static_cast<ui::DomKey>(dom_key))); 948 static_cast<ui::DomKey>(dom_key)));
948 } 949 }
949 950
950 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 951 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
951 return static_cast<int>( 952 return static_cast<int>(
952 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 953 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
953 } 954 }
954 955
955 } // namespace content 956 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/public/blink_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698