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

Unified Diff: content/shell/renderer/test_runner/TestInterfaces.h

Issue 139903015: Remove Windows mock theme engine code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « content/content_shell.gypi ('k') | content/shell/renderer/test_runner/TestInterfaces.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/TestInterfaces.h
diff --git a/content/shell/renderer/test_runner/TestInterfaces.h b/content/shell/renderer/test_runner/TestInterfaces.h
index b22410efde620cdf20a99120d10eaf015a0dc7c4..0f5002ede4f138ebfea3608152e7b14035ce85a3 100644
--- a/content/shell/renderer/test_runner/TestInterfaces.h
+++ b/content/shell/renderer/test_runner/TestInterfaces.h
@@ -11,12 +11,10 @@
#include "base/memory/scoped_ptr.h"
#include "third_party/WebKit/public/platform/WebNonCopyable.h"
-#if defined(USE_DEFAULT_RENDER_THEME)
-#include "content/shell/renderer/test_runner/WebTestThemeEngineMock.h"
-#elif defined(WIN32)
-#include "content/shell/renderer/test_runner/WebTestThemeEngineWin.h"
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
#include "content/shell/renderer/test_runner/WebTestThemeEngineMac.h"
+#else
+#include "content/shell/renderer/test_runner/WebTestThemeEngineMock.h"
#endif
namespace blink {
@@ -70,12 +68,10 @@ private:
WebTestProxyBase* m_proxy;
std::vector<WebTestProxyBase*> m_windowList;
-#if defined(USE_DEFAULT_RENDER_THEME)
- scoped_ptr<WebTestThemeEngineMock> m_themeEngine;
-#elif defined(WIN32)
- scoped_ptr<WebTestThemeEngineWin> m_themeEngine;
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
scoped_ptr<WebTestThemeEngineMac> m_themeEngine;
+#else
+ scoped_ptr<WebTestThemeEngineMock> m_themeEngine;
#endif
DISALLOW_COPY_AND_ASSIGN(TestInterfaces);
« no previous file with comments | « content/content_shell.gypi ('k') | content/shell/renderer/test_runner/TestInterfaces.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698