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

Unified Diff: Source/core/css/CSSDefaultStyleSheets.cpp

Issue 1156993013: New media playback UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: manual rebaseline. Created 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/css/CSSDefaultStyleSheets.cpp
diff --git a/Source/core/css/CSSDefaultStyleSheets.cpp b/Source/core/css/CSSDefaultStyleSheets.cpp
index 4b4f5aa698f294175ebb0a3f0c5905ade43e89f9..6e806776505f95855ea8ec48bdd522d4de42060c 100644
--- a/Source/core/css/CSSDefaultStyleSheets.cpp
+++ b/Source/core/css/CSSDefaultStyleSheets.cpp
@@ -37,6 +37,7 @@
#include "core/html/HTMLAnchorElement.h"
#include "core/html/HTMLHtmlElement.h"
#include "core/layout/LayoutTheme.h"
+#include "core/page/Page.h"
philipj_slow 2015/07/08 10:31:51 Seems to compile without this include.
liberato (no reviews please) 2015/07/09 12:10:56 thanks, removed.
#include "platform/PlatformResourceLoader.h"
#include "wtf/LeakAnnotations.h"
@@ -156,7 +157,10 @@ void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(const Element& el
// FIXME: We should assert that this sheet only contains rules for <video> and <audio>.
if (!m_mediaControlsStyleSheet && (isHTMLVideoElement(element) || isHTMLAudioElement(element))) {
- String mediaRules = loadResourceAsASCIIString("mediaControls.css") + LayoutTheme::theme().extraMediaControlsStyleSheet();
+ String mediaRules = loadResourceAsASCIIString(
+ RuntimeEnabledFeatures::newMediaPlaybackUiEnabled() ?
+ "mediaControlsNew.css" : "mediaControls.css") +
+ LayoutTheme::theme().extraMediaControlsStyleSheet();
m_mediaControlsStyleSheet = parseUASheet(mediaRules);
m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval());
m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), printEval());

Powered by Google App Engine
This is Rietveld 408576698