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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp

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, 6 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp b/third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp
index b57673fea4ae3430649aea56436e681a70451cbb..9d74361cfd97cc7a4d323089709e921cac397abb 100644
--- a/third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutThemeMobile.cpp
@@ -49,6 +49,14 @@ LayoutThemeMobile::~LayoutThemeMobile()
{
}
+String LayoutThemeMobile::extraDefaultStyleSheet()
+{
+ return LayoutThemeDefault::extraDefaultStyleSheet() +
+ loadResourceAsASCIIString("themeChromiumLinux.css") +
+ loadResourceAsASCIIString("themeChromiumAndroid.css");
+
+}
+
String LayoutThemeMobile::extraMediaControlsStyleSheet()
{
return loadResourceAsASCIIString(
@@ -56,12 +64,9 @@ String LayoutThemeMobile::extraMediaControlsStyleSheet()
"mediaControlsAndroidNew.css" : "mediaControlsAndroid.css");
}
-String LayoutThemeMobile::extraDefaultStyleSheet()
+String LayoutThemeMobile::extraFullscreenStyleSheet()
{
- return LayoutThemeDefault::extraDefaultStyleSheet() +
- loadResourceAsASCIIString("themeChromiumLinux.css") +
- loadResourceAsASCIIString("themeChromiumAndroid.css");
-
+ return loadResourceAsASCIIString("fullscreenAndroid.css");
}
void LayoutThemeMobile::adjustInnerSpinButtonStyle(ComputedStyle& style) const
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeMobile.h ('k') | third_party/WebKit/public/blink_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698