Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(386)

Unified Diff: trunk/src/content/content_shell.gypi

Issue 27993005: Revert 229521 "Revert 229507 "aura: Allow creating content_shell..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/build/build_config.h ('k') | trunk/src/content/shell/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/content_shell.gypi
===================================================================
--- trunk/src/content/content_shell.gypi (revision 229523)
+++ trunk/src/content/content_shell.gypi (working copy)
@@ -130,6 +130,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',
@@ -218,15 +219,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': [
« no previous file with comments | « trunk/src/build/build_config.h ('k') | trunk/src/content/shell/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698