diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 21:43:43 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 21:43:43 +0000 |
| commit | 26b2d369dfe4ace690da3e9bb5e4acd4b0eecb79 (patch) | |
| tree | 656b5c30085432d30f9328c42c2038bbc7a26363 | |
| parent | 9b03ee8b1971af7f4fda3871bd39ee8d5f64d331 (diff) | |
| download | chromium_src-26b2d369dfe4ace690da3e9bb5e4acd4b0eecb79.zip chromium_src-26b2d369dfe4ace690da3e9bb5e4acd4b0eecb79.tar.gz chromium_src-26b2d369dfe4ace690da3e9bb5e4acd4b0eecb79.tar.bz2 | |
MacViews: Fix builds when use_aura XOR toolkit_views is TRUE.
Ozone has use_aura=1 and toolkit_views=0. MacViews has use_aura=0 and
toolkit_views=1. Ensure these both link correctly.
This is a follow-up to r266641 and r266283.
BUG=366007
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/252963004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266965 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/gfx.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index d5cc986..44606eb 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -348,7 +348,7 @@ ], }, }], - ['use_aura==0', { + ['use_aura==0 and toolkit_views==0', { 'sources!': [ 'nine_image_painter.cc', 'nine_image_painter.h', |