Un-revert 6386 (my CSS change). Layout tests pass for me. I think the

builders just need a clobber when this is checked in.

I also fixed the SConscript and deleted the old CSS files.
Review URL: http://codereview.chromium.org/13146

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6452 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 0 deletions

diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index a4614c1..d57524f 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -28,6 +28,7 @@
 #include <vssym32.h>
 
 #include "ChromiumBridge.h"
+#include "CSSStyleSheet.h"
 #include "CSSValueKeywords.h"
 #include "Document.h"
 #include "FontSelector.h"
@@ -36,6 +37,7 @@
 #include "ScrollbarTheme.h"
 #include "SkiaUtils.h"
 #include "ThemeHelperWin.h"
+#include "UserAgentStyleSheets.h"
 
 // TODO(brettw) all of these dependencies should eventually be removed.
 #include "base/gfx/native_theme.h"
@@ -199,6 +201,16 @@ RenderTheme* theme()
     return &winTheme;
 }
 
+String RenderThemeWin::extraDefaultStyleSheet()
+{
+    return String(themeWinUserAgentStyleSheet, sizeof(themeWinUserAgentStyleSheet));
+}
+
+String RenderThemeWin::extraQuirksStyleSheet()
+{
+    return String(themeWinQuirksUserAgentStyleSheet, sizeof(themeWinQuirksUserAgentStyleSheet));
+}
+
 bool RenderThemeWin::supportsFocusRing(const RenderStyle* style) const
 {
    // Let webkit draw one of its halo rings around any focused element,
diff --git a/webkit/port/rendering/RenderThemeWin.h b/webkit/port/rendering/RenderThemeWin.h
index 5c16330..cd9cb4c 100644
--- a/webkit/port/rendering/RenderThemeWin.h
+++ b/webkit/port/rendering/RenderThemeWin.h
@@ -46,6 +46,9 @@ public:
     RenderThemeWin() { }
     ~RenderThemeWin() { }
 
+    virtual String extraDefaultStyleSheet();
+    virtual String extraQuirksStyleSheet();
+
     // A method asking if the theme's controls actually care about redrawing when hovered.
     virtual bool supportsHover(const RenderStyle*) const { return true; }