| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 } | 220 } |
| 221 | 221 |
| 222 if (use_ash) { | 222 if (use_ash) { |
| 223 sources += [ | 223 sources += [ |
| 224 "base/default_ash_event_generator_delegate.cc", | 224 "base/default_ash_event_generator_delegate.cc", |
| 225 "base/default_ash_event_generator_delegate.h", | 225 "base/default_ash_event_generator_delegate.h", |
| 226 ] | 226 ] |
| 227 | 227 |
| 228 public_deps += [ | 228 public_deps += [ |
| 229 "//ash", | 229 "//ash", |
| 230 "//ash:ash_with_aura_test_support", | 230 "//ash/test:ash_with_aura_test_support", |
| 231 "//ash:test_support_with_content", | 231 "//ash/test:test_support_with_content", |
| 232 "//ui/aura", | 232 "//ui/aura", |
| 233 "//ui/aura:test_support", | 233 "//ui/aura:test_support", |
| 234 ] | 234 ] |
| 235 } | 235 } |
| 236 if (toolkit_views) { | 236 if (toolkit_views) { |
| 237 public_deps += [ "//ui/views:test_support" ] | 237 public_deps += [ "//ui/views:test_support" ] |
| 238 } | 238 } |
| 239 | 239 |
| 240 if (enable_extensions) { | 240 if (enable_extensions) { |
| 241 public_deps += [ | 241 public_deps += [ |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 752 "../browser/ui/window_sizer/window_sizer_ash_uitest.cc", | 752 "../browser/ui/window_sizer/window_sizer_ash_uitest.cc", |
| 753 "//ash/drag_drop/drag_drop_interactive_uitest.cc", | 753 "//ash/drag_drop/drag_drop_interactive_uitest.cc", |
| 754 "//ash/wm/ash_native_cursor_manager_interactive_uitest.cc", | 754 "//ash/wm/ash_native_cursor_manager_interactive_uitest.cc", |
| 755 ] | 755 ] |
| 756 if (is_chromeos) { | 756 if (is_chromeos) { |
| 757 sources -= [ | 757 sources -= [ |
| 758 # Use only the _chromeos version on ChromeOS. | 758 # Use only the _chromeos version on ChromeOS. |
| 759 "base/view_event_test_platform_part_default.cc", | 759 "base/view_event_test_platform_part_default.cc", |
| 760 ] | 760 ] |
| 761 } | 761 } |
| 762 deps += [ "//ash:interactive_ui_test_support" ] | 762 deps += [ "//ash/test:interactive_ui_test_support" ] |
| 763 } | 763 } |
| 764 | 764 |
| 765 if (enable_notifications) { | 765 if (enable_notifications) { |
| 766 sources += [ | 766 sources += [ |
| 767 "../browser/extensions/api/notifications/notifications_apitest.cc", | 767 "../browser/extensions/api/notifications/notifications_apitest.cc", |
| 768 "../browser/notifications/message_center_notifications_browsertest.cc", | 768 "../browser/notifications/message_center_notifications_browsertest.cc", |
| 769 ] | 769 ] |
| 770 | 770 |
| 771 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform | 771 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform |
| 772 # panels). | 772 # panels). |
| (...skipping 1292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2065 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", | 2065 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", |
| 2066 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", | 2066 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", |
| 2067 "../browser/ui/ash/shelf_browsertest.cc", | 2067 "../browser/ui/ash/shelf_browsertest.cc", |
| 2068 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
", | 2068 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
", |
| 2069 "../browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc", | 2069 "../browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc", |
| 2070 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome
os.cc", | 2070 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome
os.cc", |
| 2071 "../browser/ui/ash/volume_controller_browsertest_chromeos.cc", | 2071 "../browser/ui/ash/volume_controller_browsertest_chromeos.cc", |
| 2072 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
.cc", | 2072 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
.cc", |
| 2073 ] | 2073 ] |
| 2074 deps += [ | 2074 deps += [ |
| 2075 "//ash:ash_with_aura_test_support", | 2075 "//ash/test:ash_with_aura_test_support", |
| 2076 "//ash:test_support_with_content", | 2076 "//ash/test:test_support_with_content", |
| 2077 ] | 2077 ] |
| 2078 | 2078 |
| 2079 if (enable_app_list) { | 2079 if (enable_app_list) { |
| 2080 deps += [ ":test_support_applist_ash" ] | 2080 deps += [ ":test_support_applist_ash" ] |
| 2081 } | 2081 } |
| 2082 } | 2082 } |
| 2083 if (use_aura || toolkit_views) { | 2083 if (use_aura || toolkit_views) { |
| 2084 deps += [ "//ui/events:test_support" ] | 2084 deps += [ "//ui/events:test_support" ] |
| 2085 } | 2085 } |
| 2086 if (toolkit_views) { | 2086 if (toolkit_views) { |
| (...skipping 1946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4033 "../browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_uni
ttest.cc", | 4033 "../browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_uni
ttest.cc", |
| 4034 "../browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc", | 4034 "../browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc", |
| 4035 "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.
cc", | 4035 "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.
cc", |
| 4036 "../browser/ui/ash/multi_user/user_switch_util_unittest.cc", | 4036 "../browser/ui/ash/multi_user/user_switch_util_unittest.cc", |
| 4037 "../browser/ui/ash/session_state_delegate_chromeos_unittest.cc", | 4037 "../browser/ui/ash/session_state_delegate_chromeos_unittest.cc", |
| 4038 "../browser/ui/ash/system_tray_delegate_chromeos_unittest.cc", | 4038 "../browser/ui/ash/system_tray_delegate_chromeos_unittest.cc", |
| 4039 "../browser/ui/ash/window_positioner_unittest.cc", | 4039 "../browser/ui/ash/window_positioner_unittest.cc", |
| 4040 "../browser/ui/window_sizer/window_sizer_ash_unittest.cc", | 4040 "../browser/ui/window_sizer/window_sizer_ash_unittest.cc", |
| 4041 ] | 4041 ] |
| 4042 deps += [ | 4042 deps += [ |
| 4043 "//ash:ash_with_aura_test_support", | |
| 4044 "//ash:test_support_with_content", | |
| 4045 "//ash/common/strings", | 4043 "//ash/common/strings", |
| 4046 "//ash/resources", | 4044 "//ash/resources", |
| 4045 "//ash/test:ash_with_aura_test_support", |
| 4046 "//ash/test:test_support_with_content", |
| 4047 ] | 4047 ] |
| 4048 | 4048 |
| 4049 # We eventually want to compile both in Win Aura builds, see | 4049 # We eventually want to compile both in Win Aura builds, see |
| 4050 # http://crbug.com/155545. | 4050 # http://crbug.com/155545. |
| 4051 if (!is_win) { | 4051 if (!is_win) { |
| 4052 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] | 4052 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] |
| 4053 } | 4053 } |
| 4054 } | 4054 } |
| 4055 if (use_aura) { | 4055 if (use_aura) { |
| 4056 deps += [ | 4056 deps += [ |
| (...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5015 "touch_hud", | 5015 "touch_hud", |
| 5016 "ui", | 5016 "ui", |
| 5017 ] | 5017 ] |
| 5018 | 5018 |
| 5019 if (is_linux && !is_android) { | 5019 if (is_linux && !is_android) { |
| 5020 deps += [ "//components/font_service:manifest" ] | 5020 deps += [ "//components/font_service:manifest" ] |
| 5021 packaged_services += [ "font_service" ] | 5021 packaged_services += [ "font_service" ] |
| 5022 } | 5022 } |
| 5023 } | 5023 } |
| 5024 } | 5024 } |
| OLD | NEW |