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

Unified Diff: Source/testing/runner/TestInterfaces.h

Issue 41733004: Roll up patch for running layout tests under Aura. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: move useMockTheme() into a helper function Created 7 years, 1 month 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/RenderThemeChromiumDefault.cpp ('k') | Source/testing/runner/TestInterfaces.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/testing/runner/TestInterfaces.h
diff --git a/Source/testing/runner/TestInterfaces.h b/Source/testing/runner/TestInterfaces.h
index 990ec9385b9ddca6bb4c63db831fd5ed7af58baf..781ff0360d4aa66df3c0f675d9071d499e7c2b81 100644
--- a/Source/testing/runner/TestInterfaces.h
+++ b/Source/testing/runner/TestInterfaces.h
@@ -36,7 +36,9 @@
#include <memory>
#include <vector>
-#if defined(WIN32)
+#if defined(USE_DEFAULT_RENDER_THEME)
+#include "WebTestThemeEngineMock.h"
+#elif defined(WIN32)
#include "WebTestThemeEngineWin.h"
#elif defined(__APPLE__)
#include "WebTestThemeEngineMac.h"
@@ -93,13 +95,13 @@ private:
WebTestProxyBase* m_proxy;
std::vector<WebTestProxyBase*> m_windowList;
-#if !defined(USE_DEFAULT_RENDER_THEME)
-#if defined(WIN32)
+#if defined(USE_DEFAULT_RENDER_THEME)
+ std::auto_ptr<WebTestThemeEngineMock> m_themeEngine;
+#elif defined(WIN32)
std::auto_ptr<WebTestThemeEngineWin> m_themeEngine;
#elif defined(__APPLE__)
std::auto_ptr<WebTestThemeEngineMac> m_themeEngine;
#endif
-#endif
};
}
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumDefault.cpp ('k') | Source/testing/runner/TestInterfaces.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698