| OLD | NEW |
| 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 'system/bluetooth/bluetooth_observer.h', | 318 'system/bluetooth/bluetooth_observer.h', |
| 319 'system/bluetooth/tray_bluetooth.cc', | 319 'system/bluetooth/tray_bluetooth.cc', |
| 320 'system/bluetooth/tray_bluetooth.h', | 320 'system/bluetooth/tray_bluetooth.h', |
| 321 'system/brightness_control_delegate.h', | 321 'system/brightness_control_delegate.h', |
| 322 'system/chromeos/audio/audio_detailed_view.cc', | 322 'system/chromeos/audio/audio_detailed_view.cc', |
| 323 'system/chromeos/audio/audio_detailed_view.h', | 323 'system/chromeos/audio/audio_detailed_view.h', |
| 324 'system/chromeos/audio/tray_audio_chromeos.cc', | 324 'system/chromeos/audio/tray_audio_chromeos.cc', |
| 325 'system/chromeos/audio/tray_audio_chromeos.h', | 325 'system/chromeos/audio/tray_audio_chromeos.h', |
| 326 'system/chromeos/audio/tray_audio_delegate_chromeos.cc', | 326 'system/chromeos/audio/tray_audio_delegate_chromeos.cc', |
| 327 'system/chromeos/audio/tray_audio_delegate_chromeos.h', | 327 'system/chromeos/audio/tray_audio_delegate_chromeos.h', |
| 328 'system/chromeos/enterprise/enterprise_domain_observer.h', | |
| 329 'system/chromeos/bluetooth/bluetooth_notification_controller.cc', | 328 'system/chromeos/bluetooth/bluetooth_notification_controller.cc', |
| 330 'system/chromeos/bluetooth/bluetooth_notification_controller.h', | 329 'system/chromeos/bluetooth/bluetooth_notification_controller.h', |
| 331 'system/chromeos/brightness/brightness_controller_chromeos.cc', | 330 'system/chromeos/brightness/brightness_controller_chromeos.cc', |
| 332 'system/chromeos/brightness/brightness_controller_chromeos.h', | 331 'system/chromeos/brightness/brightness_controller_chromeos.h', |
| 333 'system/chromeos/brightness/tray_brightness.cc', | 332 'system/chromeos/brightness/tray_brightness.cc', |
| 334 'system/chromeos/brightness/tray_brightness.h', | 333 'system/chromeos/brightness/tray_brightness.h', |
| 334 'system/chromeos/enterprise/enterprise_domain_observer.h', |
| 335 'system/chromeos/enterprise/tray_enterprise.cc', |
| 335 'system/chromeos/enterprise/tray_enterprise.h', | 336 'system/chromeos/enterprise/tray_enterprise.h', |
| 336 'system/chromeos/enterprise/tray_enterprise.cc', | |
| 337 'system/chromeos/keyboard_brightness_controller.cc', | 337 'system/chromeos/keyboard_brightness_controller.cc', |
| 338 'system/chromeos/keyboard_brightness_controller.h', | 338 'system/chromeos/keyboard_brightness_controller.h', |
| 339 'system/chromeos/label_tray_view.cc', |
| 339 'system/chromeos/label_tray_view.h', | 340 'system/chromeos/label_tray_view.h', |
| 340 'system/chromeos/label_tray_view.cc', | 341 'system/chromeos/managed/tray_locally_managed_user.cc', |
| 341 'system/chromeos/managed/tray_locally_managed_user.h', | 342 'system/chromeos/managed/tray_locally_managed_user.h', |
| 342 'system/chromeos/managed/tray_locally_managed_user.cc', | |
| 343 'system/chromeos/network/network_connect.cc', | 343 'system/chromeos/network/network_connect.cc', |
| 344 'system/chromeos/network/network_connect.h', | 344 'system/chromeos/network/network_connect.h', |
| 345 'system/chromeos/network/network_detailed_view.h', | 345 'system/chromeos/network/network_detailed_view.h', |
| 346 'system/chromeos/network/network_icon.cc', | 346 'system/chromeos/network/network_icon.cc', |
| 347 'system/chromeos/network/network_icon.h', | 347 'system/chromeos/network/network_icon.h', |
| 348 'system/chromeos/network/network_icon_animation.cc', | 348 'system/chromeos/network/network_icon_animation.cc', |
| 349 'system/chromeos/network/network_icon_animation.h', | 349 'system/chromeos/network/network_icon_animation.h', |
| 350 'system/chromeos/network/network_icon_animation_observer.h', | 350 'system/chromeos/network/network_icon_animation_observer.h', |
| 351 'system/chromeos/network/network_observer.h', | 351 'system/chromeos/network/network_observer.h', |
| 352 'system/chromeos/network/network_portal_detector_observer.h', | 352 'system/chromeos/network/network_portal_detector_observer.h', |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 'system/tray/actionable_view.cc', | 434 'system/tray/actionable_view.cc', |
| 435 'system/tray/actionable_view.h', | 435 'system/tray/actionable_view.h', |
| 436 'system/tray/default_system_tray_delegate.cc', | 436 'system/tray/default_system_tray_delegate.cc', |
| 437 'system/tray/default_system_tray_delegate.h', | 437 'system/tray/default_system_tray_delegate.h', |
| 438 'system/tray/fixed_sized_image_view.cc', | 438 'system/tray/fixed_sized_image_view.cc', |
| 439 'system/tray/fixed_sized_image_view.h', | 439 'system/tray/fixed_sized_image_view.h', |
| 440 'system/tray/fixed_sized_scroll_view.cc', | 440 'system/tray/fixed_sized_scroll_view.cc', |
| 441 'system/tray/fixed_sized_scroll_view.h', | 441 'system/tray/fixed_sized_scroll_view.h', |
| 442 'system/tray/hover_highlight_view.cc', | 442 'system/tray/hover_highlight_view.cc', |
| 443 'system/tray/hover_highlight_view.h', | 443 'system/tray/hover_highlight_view.h', |
| 444 'system/tray/media_security/media_capture_observer.h', |
| 445 'system/tray/media_security/multi_profile_media_tray_item.cc', |
| 446 'system/tray/media_security/multi_profile_media_tray_item.h', |
| 444 'system/tray/special_popup_row.cc', | 447 'system/tray/special_popup_row.cc', |
| 445 'system/tray/special_popup_row.h', | 448 'system/tray/special_popup_row.h', |
| 446 'system/tray/system_tray.cc', | 449 'system/tray/system_tray.cc', |
| 447 'system/tray/system_tray.h', | 450 'system/tray/system_tray.h', |
| 448 'system/tray/system_tray_bubble.cc', | 451 'system/tray/system_tray_bubble.cc', |
| 449 'system/tray/system_tray_bubble.h', | 452 'system/tray/system_tray_bubble.h', |
| 450 'system/tray/system_tray_delegate.cc', | 453 'system/tray/system_tray_delegate.cc', |
| 451 'system/tray/system_tray_delegate.h', | 454 'system/tray/system_tray_delegate.h', |
| 452 'system/tray/system_tray_item.cc', | 455 'system/tray/system_tray_item.cc', |
| 453 'system/tray/system_tray_item.h', | 456 'system/tray/system_tray_item.h', |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 722 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', | 725 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', |
| 723 '../ui/display/display.gyp:display', | 726 '../ui/display/display.gyp:display', |
| 724 '../ui/display/display.gyp:display_util', | 727 '../ui/display/display.gyp:display_util', |
| 725 ], | 728 ], |
| 726 }, { # else: chromeos!=1 | 729 }, { # else: chromeos!=1 |
| 727 'sources/': [ | 730 'sources/': [ |
| 728 ['exclude', 'display/display_configurator_animation.cc'], | 731 ['exclude', 'display/display_configurator_animation.cc'], |
| 729 ['exclude', 'display/display_configurator_animation.h'], | 732 ['exclude', 'display/display_configurator_animation.h'], |
| 730 ['exclude', 'display/resolution_notification_controller.cc'], | 733 ['exclude', 'display/resolution_notification_controller.cc'], |
| 731 ['exclude', 'display/resolution_notification_controller.h'], | 734 ['exclude', 'display/resolution_notification_controller.h'], |
| 735 ['exclude', 'system/tray/media_security/media_capture_observer.h'], |
| 736 ['exclude', 'system/tray/media_security/multi_profile_media_tray_ite
m.cc'], |
| 737 ['exclude', 'system/tray/media_security/multi_profile_media_tray_ite
m.h'], |
| 732 ], | 738 ], |
| 733 }], | 739 }], |
| 734 ], | 740 ], |
| 735 }, | 741 }, |
| 736 { | 742 { |
| 737 'target_name': 'ash_with_content', | 743 'target_name': 'ash_with_content', |
| 738 'type': '<(component)', | 744 'type': '<(component)', |
| 739 'dependencies': [ | 745 'dependencies': [ |
| 740 '../base/base.gyp:base', | 746 '../base/base.gyp:base', |
| 741 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 747 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 959 'system/chromeos/power/power_status_unittest.cc', | 965 'system/chromeos/power/power_status_unittest.cc', |
| 960 'system/chromeos/power/power_status_view_unittest.cc', | 966 'system/chromeos/power/power_status_view_unittest.cc', |
| 961 'system/chromeos/power/tray_power_unittest.cc', | 967 'system/chromeos/power/tray_power_unittest.cc', |
| 962 'system/chromeos/rotation/tray_rotation_lock_unittest.cc', | 968 'system/chromeos/rotation/tray_rotation_lock_unittest.cc', |
| 963 'system/chromeos/screen_security/screen_tray_item_unittest.cc', | 969 'system/chromeos/screen_security/screen_tray_item_unittest.cc', |
| 964 'system/chromeos/session/logout_confirmation_controller_unittest.cc', | 970 'system/chromeos/session/logout_confirmation_controller_unittest.cc', |
| 965 'system/chromeos/session/tray_session_length_limit_unittest.cc', | 971 'system/chromeos/session/tray_session_length_limit_unittest.cc', |
| 966 'system/chromeos/tray_display_unittest.cc', | 972 'system/chromeos/tray_display_unittest.cc', |
| 967 'system/date/date_view_unittest.cc', | 973 'system/date/date_view_unittest.cc', |
| 968 'system/overview/overview_button_tray_unittest.cc', | 974 'system/overview/overview_button_tray_unittest.cc', |
| 975 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc', |
| 969 'system/tray/system_tray_unittest.cc', | 976 'system/tray/system_tray_unittest.cc', |
| 970 'system/tray/tray_details_view_unittest.cc', | 977 'system/tray/tray_details_view_unittest.cc', |
| 971 'system/user/tray_user_unittest.cc', | 978 'system/user/tray_user_unittest.cc', |
| 972 'system/web_notification/web_notification_tray_unittest.cc', | 979 'system/web_notification/web_notification_tray_unittest.cc', |
| 973 'test/ash_test_helper_unittest.cc', | 980 'test/ash_test_helper_unittest.cc', |
| 974 'test/ash_unittests.cc', | 981 'test/ash_unittests.cc', |
| 975 'tooltips/tooltip_controller_unittest.cc', | 982 'tooltips/tooltip_controller_unittest.cc', |
| 976 'touch/touch_observer_hud_unittest.cc', | 983 'touch/touch_observer_hud_unittest.cc', |
| 977 'wm/app_list_controller_unittest.cc', | 984 'wm/app_list_controller_unittest.cc', |
| 978 'wm/ash_native_cursor_manager_unittest.cc', | 985 'wm/ash_native_cursor_manager_unittest.cc', |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1024 ['exclude', 'focus_cycler_unittest.cc'], | 1031 ['exclude', 'focus_cycler_unittest.cc'], |
| 1025 # All tests for multiple displays: not supported on Windows Ash. | 1032 # All tests for multiple displays: not supported on Windows Ash. |
| 1026 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc']
, | 1033 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc']
, |
| 1027 ['exclude', 'wm/drag_window_resizer_unittest.cc'], | 1034 ['exclude', 'wm/drag_window_resizer_unittest.cc'], |
| 1028 # Can't resize on Windows Ash. http://crbug.com/165962 | 1035 # Can't resize on Windows Ash. http://crbug.com/165962 |
| 1029 ['exclude', 'ash_root_window_transformer_unittest.cc'], | 1036 ['exclude', 'ash_root_window_transformer_unittest.cc'], |
| 1030 ['exclude', 'magnifier/magnification_controller_unittest.cc'], | 1037 ['exclude', 'magnifier/magnification_controller_unittest.cc'], |
| 1031 ['exclude', 'wm/workspace/workspace_window_resizer_unittest.cc'], | 1038 ['exclude', 'wm/workspace/workspace_window_resizer_unittest.cc'], |
| 1032 ['exclude', 'sticky_keys/sticky_keys_overlay_unittest.cc'], | 1039 ['exclude', 'sticky_keys/sticky_keys_overlay_unittest.cc'], |
| 1033 ['exclude', 'sticky_keys/sticky_keys_unittest.cc'], | 1040 ['exclude', 'sticky_keys/sticky_keys_unittest.cc'], |
| 1041 ['exclude', 'system/tray/media_security/multi_profile_media_tray_ite
m_unittest.cc'], |
| 1034 ['exclude', 'autoclick/autoclick_unittest.cc'], | 1042 ['exclude', 'autoclick/autoclick_unittest.cc'], |
| 1035 ], | 1043 ], |
| 1036 'sources': [ | 1044 'sources': [ |
| 1037 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc
', | 1045 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc
', |
| 1038 ], | 1046 ], |
| 1039 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 1047 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 1040 'msvs_disabled_warnings': [ 4267, ], | 1048 'msvs_disabled_warnings': [ 4267, ], |
| 1041 }], | 1049 }], |
| 1042 ['OS=="win" and win_use_allocator_shim==1', { | 1050 ['OS=="win" and win_use_allocator_shim==1', { |
| 1043 'dependencies': [ | 1051 'dependencies': [ |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1110 '../ui/views/views.gyp:views', | 1118 '../ui/views/views.gyp:views', |
| 1111 '../ui/views/views.gyp:views_test_support', | 1119 '../ui/views/views.gyp:views_test_support', |
| 1112 'ash', | 1120 'ash', |
| 1113 'ash_resources', | 1121 'ash_resources', |
| 1114 'ash_strings.gyp:ash_strings', | 1122 'ash_strings.gyp:ash_strings', |
| 1115 'ash_with_content', | 1123 'ash_with_content', |
| 1116 ], | 1124 ], |
| 1117 'sources': [ | 1125 'sources': [ |
| 1118 '../content/app/startup_helper_win.cc', | 1126 '../content/app/startup_helper_win.cc', |
| 1119 '../ui/views/test/test_views_delegate.cc', | 1127 '../ui/views/test/test_views_delegate.cc', |
| 1120 'session/session_state_delegate_stub.cc', | |
| 1121 'session/session_state_delegate_stub.h', | |
| 1122 'shell/app_list.cc', | 1128 'shell/app_list.cc', |
| 1123 'shell/bubble.cc', | 1129 'shell/bubble.cc', |
| 1124 'shell/content_client/shell_browser_main_parts.cc', | 1130 'shell/content_client/shell_browser_main_parts.cc', |
| 1125 'shell/content_client/shell_browser_main_parts.h', | 1131 'shell/content_client/shell_browser_main_parts.h', |
| 1126 'shell/content_client/shell_content_browser_client.cc', | 1132 'shell/content_client/shell_content_browser_client.cc', |
| 1127 'shell/content_client/shell_content_browser_client.h', | 1133 'shell/content_client/shell_content_browser_client.h', |
| 1128 'shell/content_client/shell_main_delegate.cc', | 1134 'shell/content_client/shell_main_delegate.cc', |
| 1129 'shell/content_client/shell_main_delegate.h', | 1135 'shell/content_client/shell_main_delegate.h', |
| 1130 'shell/context_menu.cc', | 1136 'shell/context_menu.cc', |
| 1131 'shell/context_menu.h', | 1137 'shell/context_menu.h', |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1192 'ash_shell_lib', | 1198 'ash_shell_lib', |
| 1193 'ash_test_support', | 1199 'ash_test_support', |
| 1194 ], | 1200 ], |
| 1195 'sources': [ | 1201 'sources': [ |
| 1196 'shell/window_watcher_unittest.cc', | 1202 'shell/window_watcher_unittest.cc', |
| 1197 'test/ash_unittests.cc', | 1203 'test/ash_unittests.cc', |
| 1198 ], | 1204 ], |
| 1199 }, | 1205 }, |
| 1200 ], | 1206 ], |
| 1201 } | 1207 } |
| OLD | NEW |