Index: content/content_shell.gypi |
diff --git a/content/content_shell.gypi b/content/content_shell.gypi |
index efd102fbf24c18dd5a9e7b0c44ed81db696c167b..389decde5cb9924c6fbf9f7f8a90dad363ef06e8 100644 |
--- a/content/content_shell.gypi |
+++ b/content/content_shell.gypi |
@@ -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', |
@@ -214,7 +215,7 @@ |
'../base/allocator/allocator.gyp:allocator', |
], |
}], |
- ['use_aura==1', { |
+ ['use_aura==1 and toolkit_views==1', { |
'dependencies': [ |
'../ui/aura/aura.gyp:aura', |
'../ui/base/strings/ui_strings.gyp:ui_strings', |
@@ -224,10 +225,22 @@ |
'../ui/ui.gyp:ui_resources', |
], |
'sources/': [ |
+ ['exclude', 'shell/browser/shell_aura.cc'], |
['exclude', 'shell/browser/shell_gtk.cc'], |
['exclude', 'shell/browser/shell_win.cc'], |
], |
- }], # use_aura==1 |
+ }], # use_aura==1 and toolkit_views==1 |
+ ['use_aura==1 and toolkit_views==0', { |
+ 'dependencies': [ |
+ '../ui/aura/aura.gyp:aura', |
+ '../ui/base/strings/ui_strings.gyp:ui_strings', |
Daniel Erat
2013/10/17 14:41:19
nit: is it possible to refactor these a bit furthe
sadrul
2013/10/18 13:05:19
Done.
|
+ ], |
+ 'sources/': [ |
+ ['exclude', 'shell/browser/shell_gtk.cc'], |
+ ['exclude', 'shell/browser/shell_views.cc'], |
+ ['exclude', 'shell/browser/shell_win.cc'], |
+ ], |
+ }], |
['chromeos==1', { |
'dependencies': [ |
'../chromeos/chromeos.gyp:chromeos', |