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

Unified Diff: ui/views/views.gyp

Issue 10908048: Set up new desktop classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 | « no previous file | ui/views/widget/desktop_native_widget_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/views.gyp
===================================================================
--- ui/views/views.gyp (revision 154797)
+++ ui/views/views.gyp (working copy)
@@ -18,6 +18,9 @@
['exclude', '_x\\.(h|cc)$'] ],
'dependencies': [ '../aura/aura.gyp:aura', ],
}],
+ ['OS!="linux" or chromeos==1', {
+ 'sources/': [ ['exclude', '_linux\\.(h|cc)$'] ],
+ }],
],
},
'targets': [
@@ -310,8 +313,15 @@
'widget/child_window_message_processor.h',
'widget/default_theme_provider.cc',
'widget/default_theme_provider.h',
+ 'widget/desktop_native_widget_aura.cc',
+ 'widget/desktop_native_widget_aura.h',
'widget/desktop_native_widget_helper_aura.cc',
'widget/desktop_native_widget_helper_aura.h',
+ 'widget/desktop_root_window_host.h',
+ 'widget/desktop_root_window_host_linux.cc',
+ 'widget/desktop_root_window_host_linux.h',
+ 'widget/desktop_root_window_host_win.cc',
+ 'widget/desktop_root_window_host_win.h',
'widget/drop_helper.cc',
'widget/drop_helper.h',
'widget/drop_target_win.cc',
@@ -408,11 +418,33 @@
['exclude', 'widget/tooltip_manager_views.cc'],
],
}],
+ ['OS=="win"', {
+ 'sources/': [
+ ['include', 'widget/desktop_root_window_host_win.cc'],
+ ['include', 'widget/desktop_root_window_host_win.h'],
+ ],
+ }],
],
}],
+ ['chromeos==1', {
+ 'sources!': [
+ 'widget/desktop_root_window_host.h',
+ 'widget/desktop_root_window_host_linux.cc',
+ 'widget/desktop_root_window_host_linux.h',
+ 'widget/desktop_native_widget_aura.cc',
+ 'widget/desktop_native_widget_aura.h',
+ ],
+ }],
['use_aura==0', {
'sources!': [
'widget/tooltip_manager_views.cc',
+ 'widget/desktop_root_window_host.h',
+ 'widget/desktop_root_window_host_linux.cc',
+ 'widget/desktop_root_window_host_linux.h',
+ 'widget/desktop_root_window_host_win.cc',
+ 'widget/desktop_root_window_host_win.h',
+ 'widget/desktop_native_widget_aura.cc',
+ 'widget/desktop_native_widget_aura.h',
],
}],
['use_aura==0 and OS=="win"', {
« no previous file with comments | « no previous file | ui/views/widget/desktop_native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698