diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 06:08:16 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 06:08:16 +0000 |
| commit | b63fffebc66986665da2192649b59d4b0f9a7f59 (patch) | |
| tree | 626eab07c68286ef974d3e3b0732684e9c43af1f /content/content_shell.gypi | |
| parent | 62f37684af00493f01d2212c26db073ff20b60cb (diff) | |
| download | chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.zip chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.tar.gz chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.tar.bz2 | |
aura: Allow creating content_shell without views.
This builds content_shell with use_aura=1 and toolkit_views=0.
BUG=none
R=derat@chromium.org, jamescook@chromium.org, jochen@chromium.org
Previously, on this issue:
* Landed in r229507
* Speculatively reverted in r229521.
* Relanded in r229524, since the revert didn't fix anything.
* Reverted in r229525 because it broken win-blink bots.
Review URL: https://codereview.chromium.org/26695007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 6c0f624..86ff67b 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -129,6 +129,7 @@ 'shell/browser/shell_speech_recognition_manager_delegate.h', 'shell/browser/shell_url_request_context_getter.cc', 'shell/browser/shell_url_request_context_getter.h', + 'shell/browser/shell_views.cc', 'shell/browser/shell_web_contents_view_delegate_android.cc', 'shell/browser/shell_web_contents_view_delegate_creator.h', 'shell/browser/shell_web_contents_view_delegate_gtk.cc', @@ -217,15 +218,28 @@ 'dependencies': [ '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', - '../ui/views/controls/webview/webview.gyp:webview', - '../ui/views/views.gyp:views', - '../ui/views/views.gyp:views_test_support', - '../ui/ui.gyp:ui_resources', ], 'sources/': [ ['exclude', 'shell/browser/shell_gtk.cc'], ['exclude', 'shell/browser/shell_win.cc'], ], + 'conditions': [ + ['toolkit_views==1', { + 'dependencies': [ + '../ui/views/controls/webview/webview.gyp:webview', + '../ui/views/views.gyp:views', + '../ui/views/views.gyp:views_test_support', + '../ui/ui.gyp:ui_resources', + ], + 'sources/': [ + ['exclude', 'shell/browser/shell_aura.cc'], + ], + }, { + 'sources/': [ + ['exclude', 'shell/browser/shell_views.cc'], + ], + }], + ], }], # use_aura==1 ['chromeos==1', { 'dependencies': [ |