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

Unified Diff: ui/aura/aura.gyp

Issue 1390883003: aura: Unify WindowTreeHost for some platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix ash_unittests, sadrul's comments Created 5 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
Index: ui/aura/aura.gyp
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index efaa46368ca11f50adfcaefda02822c41eb007a7..e3deaa0af5b445e8ca811ab67d83d3e2152e1cae 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -108,10 +108,8 @@
'window_tree_host_mac.h',
'window_tree_host_mac.mm',
'window_tree_host_observer.h',
- 'window_tree_host_ozone.cc',
- 'window_tree_host_ozone.h',
- 'window_tree_host_win.cc',
- 'window_tree_host_win.h',
+ 'window_tree_host_platform.cc',
+ 'window_tree_host_platform.h',
'window_tree_host_x11.cc',
'window_tree_host_x11.h',
],
@@ -142,6 +140,17 @@
'../ozone/ozone.gyp:ozone_base',
],
}],
+ ['OS!="win" and OS!="android" and use_ozone==0', {
+ 'sources!': [
+ 'window_tree_host_platform.cc',
+ 'window_tree_host_platform.h',
+ ],
+ }],
+ ['OS=="android"', {
+ 'dependencies': [
+ '../platform_window/android/android_window.gyp:android_window',
oshima 2015/10/16 18:31:42 nit: indent
+ ],
+ }],
],
},
{

Powered by Google App Engine
This is Rietveld 408576698