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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « Source/testing/runner/TestInterfaces.h ('k') | Source/testing/runner/WebTestThemeEngineMock.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 } 190 }
191 191
192 const vector<WebTestProxyBase*>& TestInterfaces::windowList() 192 const vector<WebTestProxyBase*>& TestInterfaces::windowList()
193 { 193 {
194 return m_windowList; 194 return m_windowList;
195 } 195 }
196 196
197 WebThemeEngine* TestInterfaces::themeEngine() 197 WebThemeEngine* TestInterfaces::themeEngine()
198 { 198 {
199 #if defined(USE_DEFAULT_RENDER_THEME) || !(defined(WIN32) || defined(__APPLE__)) 199 #if defined(USE_DEFAULT_RENDER_THEME) || !(defined(WIN32) || defined(__APPLE__))
200 #if defined(USE_AURA)
201 if (!m_themeEngine.get())
202 m_themeEngine.reset(new WebTestThemeEngineMock());
203 return m_themeEngine.get();
204 #else
200 return 0; 205 return 0;
206 #endif
201 #elif defined(WIN32) 207 #elif defined(WIN32)
202 if (!m_themeEngine.get()) 208 if (!m_themeEngine.get())
203 m_themeEngine.reset(new WebTestThemeEngineWin()); 209 m_themeEngine.reset(new WebTestThemeEngineWin());
204 return m_themeEngine.get(); 210 return m_themeEngine.get();
205 #elif defined(__APPLE__) 211 #elif defined(__APPLE__)
206 if (!m_themeEngine.get()) 212 if (!m_themeEngine.get())
207 m_themeEngine.reset(new WebTestThemeEngineMac()); 213 m_themeEngine.reset(new WebTestThemeEngineMac());
208 return m_themeEngine.get(); 214 return m_themeEngine.get();
209 #endif 215 #endif
210 } 216 }
211 217
212 } 218 }
OLDNEW
« 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