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

Unified Diff: Source/core/layout/LayoutThemeDefault.cpp

Issue 1142303005: Remove legacy SELECT popup code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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
« no previous file with comments | « no previous file | Source/platform/HostWindow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutThemeDefault.cpp
diff --git a/Source/core/layout/LayoutThemeDefault.cpp b/Source/core/layout/LayoutThemeDefault.cpp
index c0a678dd4c80dbf172f240cfdbc784ca15325c52..ff69d719bb7293dc52916a544e8016912d1d1ed9 100644
--- a/Source/core/layout/LayoutThemeDefault.cpp
+++ b/Source/core/layout/LayoutThemeDefault.cpp
@@ -109,21 +109,13 @@ Color LayoutThemeDefault::systemColor(CSSValueID cssValueId) const
// Use the Windows style sheets to match their metrics.
String LayoutThemeDefault::extraDefaultStyleSheet()
{
- String legacyOptionStyle;
- if (!RuntimeEnabledFeatures::htmlPopupMenuEnabled()) {
- // Option font must be inherited because we depend on computing the size
- // of the <select> based on the size of the options, and they must use
- // the same font for that computation to be correct.
- legacyOptionStyle = "option { font: inherit !important; }";
- }
return LayoutTheme::extraDefaultStyleSheet()
+ loadResourceAsASCIIString("themeWin.css")
+ loadResourceAsASCIIString("themeChromiumSkia.css")
- + loadResourceAsASCIIString("themeChromium.css")
#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
+ loadResourceAsASCIIString("themeInputMultipleFields.css")
#endif
- + legacyOptionStyle;
+ + loadResourceAsASCIIString("themeChromium.css");
}
String LayoutThemeDefault::extraQuirksStyleSheet()
« no previous file with comments | « no previous file | Source/platform/HostWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698