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

Unified Diff: Source/core/rendering/RenderThemeChromiumMac.mm

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
Index: Source/core/rendering/RenderThemeChromiumMac.mm
diff --git a/Source/core/rendering/RenderThemeChromiumMac.mm b/Source/core/rendering/RenderThemeChromiumMac.mm
index 3eaa0b614ec53b33645b270abc0cd2e093079e9c..ba033327134463519eaa487772f7fbc91b3e8084 100644
--- a/Source/core/rendering/RenderThemeChromiumMac.mm
+++ b/Source/core/rendering/RenderThemeChromiumMac.mm
@@ -23,7 +23,6 @@
#import "core/CSSValueKeywords.h"
#import "core/HTMLNames.h"
-#import "core/UserAgentStyleSheets.h"
#import "core/css/CSSValueList.h"
#import "core/dom/Document.h"
#import "core/dom/Element.h"
@@ -44,6 +43,7 @@
#import "core/rendering/RenderView.h"
#import "core/rendering/style/ShadowList.h"
#import "platform/LayoutTestSupport.h"
+#import "platform/PlatformResourceLoader.h"
#import "platform/SharedBuffer.h"
#import "platform/geometry/FloatRoundedRect.h"
#import "platform/graphics/BitmapImage.h"
@@ -1797,9 +1797,9 @@ String RenderThemeChromiumMac::extraFullScreenStyleSheet()
String RenderThemeChromiumMac::extraDefaultStyleSheet()
{
return RenderTheme::extraDefaultStyleSheet() +
- String(themeChromiumCss, sizeof(themeChromiumCss)) +
- String(themeInputMultipleFieldsCss, sizeof(themeInputMultipleFieldsCss)) +
- String(themeMacCss, sizeof(themeMacCss));
+ loadResourceAsASCIIString("themeChromium.css") +
+ loadResourceAsASCIIString("themeInputMultipleFields.css") +
+ loadResourceAsASCIIString("themeMac.css");
}
bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumLinux.cpp ('k') | Source/core/rendering/RenderThemeChromiumSkia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698