diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 18:26:25 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 18:26:25 +0000 |
commit | c36b0bfba80a88ce3776739575a1103235c409d1 (patch) | |
tree | d37790e560bff4136f3c723c95c645abec7caf76 /views/views.gyp | |
parent | 5b37cb72a5bfbcc1daa57249319a8235d0d4874a (diff) | |
download | chromium_src-c36b0bfba80a88ce3776739575a1103235c409d1.zip chromium_src-c36b0bfba80a88ce3776739575a1103235c409d1.tar.gz chromium_src-c36b0bfba80a88ce3776739575a1103235c409d1.tar.bz2 |
Tweaks Compositor API. To make it possible to land this I've ifdef'd
the code in a couple of places.
BUG=none
TEST=none
R=ben@chromium.org,wjmaclean@chromium.org,rjkroege@chromium.org
Review URL: http://codereview.chromium.org/6999005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
-rw-r--r-- | views/views.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/views/views.gyp b/views/views.gyp index 6489d87..3c4bf77 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -603,6 +603,7 @@ 'test/test_views_delegate.cc', 'test/test_views_delegate.h', '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', ], 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |