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

Unified Diff: chrome/chrome_tests.gypi

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 9 years, 2 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 78f01c3fedc2c4509ba8d422e859e8693ee6acef..a469160612d318a15346248dec5bb1cad31f517d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -229,6 +229,12 @@
'../content/common/notification_observer_mock.h',
'../ui/gfx/image/image_unittest_util.h',
'../ui/gfx/image/image_unittest_util.cc',
+ '../ui/gfx/compositor/test_compositor.cc',
+ '../ui/gfx/compositor/test_compositor.h',
+ '../ui/gfx/compositor/test_texture.cc',
+ '../ui/gfx/compositor/test_texture.h',
+ '../views/widget/widget.h',
sky 2011/10/13 19:52:00 Ugh. I don't like pulling in widget here. How abou
danakj 2011/10/14 15:15:13 moved the factory methods to ui::Compositor instea
+ '../views/widget/widget.cc',
'../webkit/quota/mock_quota_manager.cc',
'../webkit/quota/mock_quota_manager.h',
],
@@ -238,6 +244,16 @@
['exclude', '^browser/chromeos'],
],
}],
+ ['views_compositor!=1', {
+ 'sources!': [
+ '../ui/gfx/compositor/test_compositor.cc',
+ '../ui/gfx/compositor/test_compositor.h',
+ '../ui/gfx/compositor/test_texture.cc',
+ '../ui/gfx/compositor/test_texture.h',
+ '../views/widget/widget.h',
+ '../views/widget/widget.cc',
+ ],
+ }],
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',

Powered by Google App Engine
This is Rietveld 408576698