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

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

Issue 849163003: Reland: 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: Rebase Created 5 years, 11 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 d08bd8a78172d947b08dd48df31487d3e653a9b9..76d62f3b67f44aeaf6900d57df03e1526ac69f71 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/layout/LayoutSlider.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderMediaControls.h"
#include "core/rendering/RenderObject.h"
#include "core/rendering/RenderProgress.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,14 +60,15 @@ RenderThemeChromiumAndroid::~RenderThemeChromiumAndroid()
String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet()
{
- return String(mediaControlsAndroidCss, sizeof(mediaControlsAndroidCss));
+ return loadResourceAsASCIIString("mediaControlsAndroid.css");
}
String RenderThemeChromiumAndroid::extraDefaultStyleSheet()
{
return RenderThemeChromiumDefault::extraDefaultStyleSheet() +
- String(themeChromiumLinuxCss, sizeof(themeChromiumLinuxCss)) +
- String(themeChromiumAndroidCss, sizeof(themeChromiumAndroidCss));
+ loadResourceAsASCIIString("themeChromiumLinux.css") +
+ loadResourceAsASCIIString("themeChromiumAndroid.css");
+
}
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