diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 22:35:13 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 22:35:13 +0000 |
| commit | 8d8c773c297d22dbf01e2bbb69b7335f52208845 (patch) | |
| tree | d45e8affaa57b2dd2516e14c03c3a5f9238247f0 /ui/ui.gyp | |
| parent | 93543752960447decfc8f0ca38ef9f44f7209cfd (diff) | |
| download | chromium_src-8d8c773c297d22dbf01e2bbb69b7335f52208845.zip chromium_src-8d8c773c297d22dbf01e2bbb69b7335f52208845.tar.gz chromium_src-8d8c773c297d22dbf01e2bbb69b7335f52208845.tar.bz2 | |
Re-land: Create a new views_aura_desktop.
Get views::Widget rendering working against an aura::Window NativeWidget.
http://crbug.com/93944
TEST=none
Original review URL: http://codereview.chromium.org/7741027
Review URL: http://codereview.chromium.org/7747032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -265,6 +265,7 @@ 'gfx/render_text_win.cc', 'gfx/render_text_win.h', 'gfx/screen.h', + 'gfx/screen_aura.cc', 'gfx/screen_gtk.cc', 'gfx/screen_wayland.cc', 'gfx/screen_win.cc', @@ -285,6 +286,11 @@ 'gfx/transform.cc', ], 'conditions': [ + ['use_aura==1', { + 'sources/': [ + ['exclude', 'gfx/screen_win.cc'], + ], + }], ['toolkit_uses_gtk == 1', { 'dependencies': [ # font_gtk.cc uses fontconfig. |