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

Side by Side Diff: ash/ash.gyp

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 'frame/caption_buttons/maximize_bubble_controller.cc', 177 'frame/caption_buttons/maximize_bubble_controller.cc',
178 'frame/caption_buttons/maximize_bubble_controller.h', 178 'frame/caption_buttons/maximize_bubble_controller.h',
179 'frame/caption_buttons/maximize_bubble_controller_bubble.cc', 179 'frame/caption_buttons/maximize_bubble_controller_bubble.cc',
180 'frame/caption_buttons/maximize_bubble_controller_bubble.h', 180 'frame/caption_buttons/maximize_bubble_controller_bubble.h',
181 'frame/custom_frame_view_ash.cc', 181 'frame/custom_frame_view_ash.cc',
182 'frame/custom_frame_view_ash.h', 182 'frame/custom_frame_view_ash.h',
183 'frame/frame_border_hit_test_controller.cc', 183 'frame/frame_border_hit_test_controller.cc',
184 'frame/frame_border_hit_test_controller.h', 184 'frame/frame_border_hit_test_controller.h',
185 'frame/default_header_painter.cc', 185 'frame/default_header_painter.cc',
186 'frame/default_header_painter.h', 186 'frame/default_header_painter.h',
187 » 'frame/frame_util.cc', 187 'frame/frame_util.cc',
188 » 'frame/frame_util.h', 188 'frame/frame_util.h',
189 'frame/header_painter.h', 189 'frame/header_painter.h',
190 'frame/header_painter_util.cc', 190 'frame/header_painter_util.cc',
191 'frame/header_painter_util.h', 191 'frame/header_painter_util.h',
192 'gpu_support.h', 192 'gpu_support.h',
193 'gpu_support_stub.cc', 193 'gpu_support_stub.cc',
194 'gpu_support_stub.h', 194 'gpu_support_stub.h',
195 'high_contrast/high_contrast_controller.cc', 195 'high_contrast/high_contrast_controller.cc',
196 'high_contrast/high_contrast_controller.h', 196 'high_contrast/high_contrast_controller.h',
197 'host/window_tree_host_factory.cc', 197 'host/ash_remote_window_tree_host_win.cc',
198 'host/window_tree_host_factory.h', 198 'host/ash_remote_window_tree_host_win.h',
199 'host/window_tree_host_factory_win.cc', 199 'host/ash_window_tree_host.h',
200 'host/ash_window_tree_host_ozone.cc',
201 'host/ash_window_tree_host_win.cc',
202 'host/ash_window_tree_host_x11.cc',
203 'host/ash_window_tree_host_x11.h',
204 'host/root_window_transformer.h',
205 'host/transformer_helper.cc',
206 'host/transformer_helper.h',
200 'ime/candidate_view.cc', 207 'ime/candidate_view.cc',
201 'ime/candidate_view.h', 208 'ime/candidate_view.h',
202 'ime/candidate_window_view.cc', 209 'ime/candidate_window_view.cc',
203 'ime/candidate_window_view.h', 210 'ime/candidate_window_view.h',
204 'ime/infolist_window.cc', 211 'ime/infolist_window.cc',
205 'ime/infolist_window.h', 212 'ime/infolist_window.h',
206 'ime/input_method_menu_item.cc', 213 'ime/input_method_menu_item.cc',
207 'ime/input_method_menu_item.h', 214 'ime/input_method_menu_item.h',
208 'ime/input_method_menu_manager.cc', 215 'ime/input_method_menu_manager.cc',
209 'ime/input_method_menu_manager.h', 216 'ime/input_method_menu_manager.h',
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 }], 684 }],
678 ['use_x11!=1', { 685 ['use_x11!=1', {
679 'sources/': [ 686 'sources/': [
680 ['exclude', 'accelerators/key_hold_detector.cc'], 687 ['exclude', 'accelerators/key_hold_detector.cc'],
681 ['exclude', 'accelerators/key_hold_detector.h'], 688 ['exclude', 'accelerators/key_hold_detector.h'],
682 ['exclude', 'accelerators/magnifier_key_scroller.cc'], 689 ['exclude', 'accelerators/magnifier_key_scroller.cc'],
683 ['exclude', 'accelerators/magnifier_key_scroller.h'], 690 ['exclude', 'accelerators/magnifier_key_scroller.h'],
684 ['exclude', 'accelerators/spoken_feedback_toggler.cc'], 691 ['exclude', 'accelerators/spoken_feedback_toggler.cc'],
685 ['exclude', 'accelerators/spoken_feedback_toggler.h'], 692 ['exclude', 'accelerators/spoken_feedback_toggler.h'],
686 ], 693 ],
694 }, { # else: use_x11==1
695 'dependencies': [
696 '../build/linux/system.gyp:xfixes',
697 ],
687 }], 698 }],
688 ['chromeos==1', { 699 ['chromeos==1', {
689 'dependencies': [ 700 'dependencies': [
690 '../chromeos/chromeos.gyp:chromeos', 701 '../chromeos/chromeos.gyp:chromeos',
691 # Ash #includes power_supply_properties.pb.h directly. 702 # Ash #includes power_supply_properties.pb.h directly.
692 '../chromeos/chromeos.gyp:power_manager_proto', 703 '../chromeos/chromeos.gyp:power_manager_proto',
693 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 704 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
694 '../ui/display/display.gyp:display', 705 '../ui/display/display.gyp:display',
695 ], 706 ],
696 }, { # else: chromeos!=1 707 }, { # else: chromeos!=1
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 'display/screen_position_controller_unittest.cc', 901 'display/screen_position_controller_unittest.cc',
891 'drag_drop/drag_drop_controller_unittest.cc', 902 'drag_drop/drag_drop_controller_unittest.cc',
892 'drag_drop/drag_drop_tracker_unittest.cc', 903 'drag_drop/drag_drop_tracker_unittest.cc',
893 'extended_desktop_unittest.cc', 904 'extended_desktop_unittest.cc',
894 'focus_cycler_unittest.cc', 905 'focus_cycler_unittest.cc',
895 'frame/caption_buttons/alternate_frame_size_button_unittest.cc', 906 'frame/caption_buttons/alternate_frame_size_button_unittest.cc',
896 'frame/caption_buttons/frame_caption_button_container_view_unittest.cc', 907 'frame/caption_buttons/frame_caption_button_container_view_unittest.cc',
897 'frame/caption_buttons/frame_maximize_button_unittest.cc', 908 'frame/caption_buttons/frame_maximize_button_unittest.cc',
898 'frame/custom_frame_view_ash_unittest.cc', 909 'frame/custom_frame_view_ash_unittest.cc',
899 'frame/default_header_painter_unittest.cc', 910 'frame/default_header_painter_unittest.cc',
911 'host/ash_window_tree_host_x11_unittest.cc',
900 'ime/candidate_window_view_unittest.cc', 912 'ime/candidate_window_view_unittest.cc',
901 'ime/input_method_menu_item_unittest.cc', 913 'ime/input_method_menu_item_unittest.cc',
902 'ime/input_method_menu_manager_unittest.cc', 914 'ime/input_method_menu_manager_unittest.cc',
903 'keyboard_overlay/keyboard_overlay_delegate_unittest.cc', 915 'keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
904 'keyboard_overlay/keyboard_overlay_view_unittest.cc', 916 'keyboard_overlay/keyboard_overlay_view_unittest.cc',
905 'magnifier/magnification_controller_unittest.cc', 917 'magnifier/magnification_controller_unittest.cc',
906 'root_window_controller_unittest.cc', 918 'root_window_controller_unittest.cc',
907 'screen_util_unittest.cc', 919 'screen_util_unittest.cc',
908 'screensaver/screensaver_view_unittest.cc', 920 'screensaver/screensaver_view_unittest.cc',
909 'session_state_delegate_stub.cc', 921 'session_state_delegate_stub.cc',
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 }], 1155 }],
1144 ['chromeos==1', { 1156 ['chromeos==1', {
1145 'dependencies': [ 1157 'dependencies': [
1146 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1158 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1147 ], 1159 ],
1148 }], 1160 }],
1149 ], 1161 ],
1150 }, 1162 },
1151 ], 1163 ],
1152 } 1164 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698