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

Unified Diff: Source/core/rendering/RenderThemeChromiumSkia.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/rendering/RenderThemeChromiumMac.mm ('k') | Source/modules/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderThemeChromiumSkia.cpp
diff --git a/Source/core/rendering/RenderThemeChromiumSkia.cpp b/Source/core/rendering/RenderThemeChromiumSkia.cpp
index fc4031387ba321fd3ff1475f808e9384bbe762fa..b1e635d63706aee66d5108c884b4fad03d36c5e5 100644
--- a/Source/core/rendering/RenderThemeChromiumSkia.cpp
+++ b/Source/core/rendering/RenderThemeChromiumSkia.cpp
@@ -24,7 +24,6 @@
#include "config.h"
#include "core/rendering/RenderThemeChromiumSkia.h"
-#include "core/UserAgentStyleSheets.h"
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderBox.h"
#include "core/rendering/RenderMediaControls.h"
@@ -32,6 +31,7 @@
#include "core/rendering/RenderProgress.h"
#include "core/rendering/RenderThemeChromiumFontProvider.h"
#include "platform/LayoutTestSupport.h"
+#include "platform/PlatformResourceLoader.h"
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/Image.h"
#include "platform/scroll/ScrollbarTheme.h"
@@ -70,14 +70,14 @@ RenderThemeChromiumSkia::~RenderThemeChromiumSkia()
String RenderThemeChromiumSkia::extraDefaultStyleSheet()
{
return RenderTheme::extraDefaultStyleSheet() +
- String(themeWinCss, sizeof(themeWinCss)) +
- String(themeChromiumSkiaCss, sizeof(themeChromiumSkiaCss)) +
- String(themeChromiumCss, sizeof(themeChromiumCss));
+ loadResourceAsASCIIString("themeWin.css") +
+ loadResourceAsASCIIString("themeChromiumSkia.css") +
+ loadResourceAsASCIIString("themeChromium.css");
}
String RenderThemeChromiumSkia::extraQuirksStyleSheet()
{
- return String(themeWinQuirksCss, sizeof(themeWinQuirksCss));
+ return loadResourceAsASCIIString("themeWinQuirks.css");
}
bool RenderThemeChromiumSkia::supportsHover(const RenderStyle* style) const
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumMac.mm ('k') | Source/modules/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698