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

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

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/testing/runner/TestInterfaces.h ('k') | Source/testing/runner/WebTestThemeEngineMock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/testing/runner/TestInterfaces.cpp
diff --git a/Source/testing/runner/TestInterfaces.cpp b/Source/testing/runner/TestInterfaces.cpp
index 56a3fb4aae6224917abbe71953d9a46f93d50f98..0a4fcb9b9fa629e31d97331e5287b5a47e5b8e4e 100644
--- a/Source/testing/runner/TestInterfaces.cpp
+++ b/Source/testing/runner/TestInterfaces.cpp
@@ -197,7 +197,13 @@ const vector<WebTestProxyBase*>& TestInterfaces::windowList()
WebThemeEngine* TestInterfaces::themeEngine()
{
#if defined(USE_DEFAULT_RENDER_THEME) || !(defined(WIN32) || defined(__APPLE__))
+#if defined(USE_AURA)
+ if (!m_themeEngine.get())
+ m_themeEngine.reset(new WebTestThemeEngineMock());
+ return m_themeEngine.get();
+#else
return 0;
+#endif
#elif defined(WIN32)
if (!m_themeEngine.get())
m_themeEngine.reset(new WebTestThemeEngineWin());
« no previous file with comments | « Source/testing/runner/TestInterfaces.h ('k') | Source/testing/runner/WebTestThemeEngineMock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698