Index: ash/ash.gyp |
diff --git a/ash/ash.gyp b/ash/ash.gyp |
index 0d62c8751c5fc282171d7c20d2498943788a2b7e..43eadd4e8bc3590de849b017d2633fd2510e6ee9 100644 |
--- a/ash/ash.gyp |
+++ b/ash/ash.gyp |
@@ -184,8 +184,8 @@ |
'frame/frame_border_hit_test_controller.h', |
'frame/default_header_painter.cc', |
'frame/default_header_painter.h', |
- 'frame/frame_util.cc', |
- 'frame/frame_util.h', |
+ 'frame/frame_util.cc', |
+ 'frame/frame_util.h', |
'frame/header_painter.h', |
'frame/header_painter_util.cc', |
'frame/header_painter_util.h', |
@@ -194,9 +194,16 @@ |
'gpu_support_stub.h', |
'high_contrast/high_contrast_controller.cc', |
'high_contrast/high_contrast_controller.h', |
- 'host/window_tree_host_factory.cc', |
- 'host/window_tree_host_factory.h', |
- 'host/window_tree_host_factory_win.cc', |
+ 'host/ash_remote_window_tree_host_win.cc', |
+ 'host/ash_remote_window_tree_host_win.h', |
+ 'host/ash_window_tree_host.h', |
+ 'host/ash_window_tree_host_ozone.cc', |
+ 'host/ash_window_tree_host_win.cc', |
+ 'host/ash_window_tree_host_x11.cc', |
+ 'host/ash_window_tree_host_x11.h', |
+ 'host/root_window_transformer.h', |
+ 'host/transformer_helper.cc', |
+ 'host/transformer_helper.h', |
'ime/candidate_view.cc', |
'ime/candidate_view.h', |
'ime/candidate_window_view.cc', |
@@ -684,6 +691,10 @@ |
['exclude', 'accelerators/spoken_feedback_toggler.cc'], |
['exclude', 'accelerators/spoken_feedback_toggler.h'], |
], |
+ }, { # else: use_x11==1 |
+ 'dependencies': [ |
+ '../build/linux/system.gyp:xfixes', |
+ ], |
}], |
['chromeos==1', { |
'dependencies': [ |
@@ -897,6 +908,7 @@ |
'frame/caption_buttons/frame_maximize_button_unittest.cc', |
'frame/custom_frame_view_ash_unittest.cc', |
'frame/default_header_painter_unittest.cc', |
+ 'host/ash_window_tree_host_x11_unittest.cc', |
'ime/candidate_window_view_unittest.cc', |
'ime/input_method_menu_item_unittest.cc', |
'ime/input_method_menu_manager_unittest.cc', |