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

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

Issue 2097983002: Merge to M52: Exclude more CSS properties for fullscreen video on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 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/Source/core/css/CSSDefaultStyleSheets.cpp » ('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 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 {"generatePasswordHover", 686 {"generatePasswordHover",
687 IDR_PASSWORD_GENERATION_ICON_HOVER, 687 IDR_PASSWORD_GENERATION_ICON_HOVER,
688 ui::SCALE_FACTOR_100P}, 688 ui::SCALE_FACTOR_100P},
689 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, 689 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE},
690 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, 690 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE},
691 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE}, 691 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE},
692 #if defined(OS_ANDROID) 692 #if defined(OS_ANDROID)
693 {"themeChromiumAndroid.css", 693 {"themeChromiumAndroid.css",
694 IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS, 694 IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS,
695 ui::SCALE_FACTOR_NONE}, 695 ui::SCALE_FACTOR_NONE},
696 {"fullscreenAndroid.css",
697 IDR_UASTYLE_FULLSCREEN_ANDROID_CSS,
698 ui::SCALE_FACTOR_NONE},
696 {"mediaControlsAndroid.css", 699 {"mediaControlsAndroid.css",
697 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS, 700 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS,
698 ui::SCALE_FACTOR_NONE}, 701 ui::SCALE_FACTOR_NONE},
699 {"mediaControlsAndroidNew.css", 702 {"mediaControlsAndroidNew.css",
700 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS, 703 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS,
701 ui::SCALE_FACTOR_NONE}, 704 ui::SCALE_FACTOR_NONE},
702 #endif 705 #endif
703 #if !defined(OS_WIN) 706 #if !defined(OS_WIN)
704 {"themeChromiumLinux.css", 707 {"themeChromiumLinux.css",
705 IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS, 708 IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS,
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 1002 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
1000 static_cast<ui::DomKey>(dom_key))); 1003 static_cast<ui::DomKey>(dom_key)));
1001 } 1004 }
1002 1005
1003 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 1006 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
1004 return static_cast<int>( 1007 return static_cast<int>(
1005 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 1008 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
1006 } 1009 }
1007 1010
1008 } // namespace content 1011 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698