diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 05:27:55 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 05:27:55 +0000 |
| commit | ecc87c893aa197f737b1d365d32093b51c2f0873 (patch) | |
| tree | 35dee950bdc8f7e8bbdb073e535c1dd248bf3d18 /content/content_shell.gypi | |
| parent | fe1e2e97f78bb34ad3e29ec26fbb5f6f7ed52a90 (diff) | |
| download | chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.zip chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.tar.gz chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.tar.bz2 | |
Revert 229507 "aura: Allow creating content_shell without views."
Speculative. All windows bots on the main waterfall except for the clobber
builder started timing out during compile during a window that had only this
change and two test-only changes in the range.
> 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
>
> Review URL: https://codereview.chromium.org/26695007
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/30413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index fb2960b..efd102f 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -130,7 +130,6 @@ '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', @@ -219,28 +218,15 @@ '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': [ |