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

Unified Diff: Source/core/rendering/RenderThemeChromiumAndroid.cpp

Issue 567073004: Revert of Move the user agent styles sheets to blink_resources.grd (Part 3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.cpp ('k') | Source/core/rendering/RenderThemeChromiumDefault.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderThemeChromiumAndroid.cpp
diff --git a/Source/core/rendering/RenderThemeChromiumAndroid.cpp b/Source/core/rendering/RenderThemeChromiumAndroid.cpp
index ec9e801eeb6d9610ccd06eaa04bf113226b8a22a..2e4aacee65c85dbeb2d428f92d01157540fe4922 100644
--- a/Source/core/rendering/RenderThemeChromiumAndroid.cpp
+++ b/Source/core/rendering/RenderThemeChromiumAndroid.cpp
@@ -28,13 +28,13 @@
#include "core/CSSValueKeywords.h"
#include "core/InputTypeNames.h"
+#include "core/UserAgentStyleSheets.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderMediaControls.h"
#include "core/rendering/RenderObject.h"
#include "core/rendering/RenderProgress.h"
#include "core/rendering/RenderSlider.h"
#include "platform/LayoutTestSupport.h"
-#include "platform/PlatformResourceLoader.h"
#include "platform/graphics/Color.h"
#include "platform/scroll/ScrollbarTheme.h"
#include "public/platform/Platform.h"
@@ -60,13 +60,13 @@
String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet()
{
- return loadResourceAsASCIIString("mediaControlsAndroid.css");
+ return String(mediaControlsAndroidCss, sizeof(mediaControlsAndroidCss));
}
String RenderThemeChromiumAndroid::extraDefaultStyleSheet()
{
return RenderThemeChromiumDefault::extraDefaultStyleSheet() +
- loadResourceAsASCIIString("themeChromiumAndroid.css");
+ String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss));
}
void RenderThemeChromiumAndroid::adjustInnerSpinButtonStyle(RenderStyle* style, Element*) const
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.cpp ('k') | Source/core/rendering/RenderThemeChromiumDefault.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698