| 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:test_support_without_content", | 230 "//ash:ash_with_aura_test_support", |
| 231 "//ash:test_support_with_content", |
| 231 "//ui/aura", | 232 "//ui/aura", |
| 232 "//ui/aura:test_support", | 233 "//ui/aura:test_support", |
| 233 ] | 234 ] |
| 234 } | 235 } |
| 235 if (toolkit_views) { | 236 if (toolkit_views) { |
| 236 public_deps += [ "//ui/views:test_support" ] | 237 public_deps += [ "//ui/views:test_support" ] |
| 237 } | 238 } |
| 238 | 239 |
| 239 if (enable_extensions) { | 240 if (enable_extensions) { |
| 240 public_deps += [ | 241 public_deps += [ |
| (...skipping 1819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2060 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", | 2061 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", |
| 2061 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", | 2062 "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", |
| 2062 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", | 2063 "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", |
| 2063 "../browser/ui/ash/shelf_browsertest.cc", | 2064 "../browser/ui/ash/shelf_browsertest.cc", |
| 2064 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
", | 2065 "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
", |
| 2065 "../browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc", | 2066 "../browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc", |
| 2066 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome
os.cc", | 2067 "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome
os.cc", |
| 2067 "../browser/ui/ash/volume_controller_browsertest_chromeos.cc", | 2068 "../browser/ui/ash/volume_controller_browsertest_chromeos.cc", |
| 2068 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
.cc", | 2069 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
.cc", |
| 2069 ] | 2070 ] |
| 2070 deps += [ "//ash:test_support_without_content" ] | 2071 deps += [ |
| 2072 "//ash:ash_with_aura_test_support", |
| 2073 "//ash:test_support_with_content", |
| 2074 ] |
| 2071 | 2075 |
| 2072 if (enable_app_list) { | 2076 if (enable_app_list) { |
| 2073 deps += [ ":test_support_applist_ash" ] | 2077 deps += [ ":test_support_applist_ash" ] |
| 2074 } | 2078 } |
| 2075 } | 2079 } |
| 2076 if (use_aura || toolkit_views) { | 2080 if (use_aura || toolkit_views) { |
| 2077 deps += [ "//ui/events:test_support" ] | 2081 deps += [ "//ui/events:test_support" ] |
| 2078 } | 2082 } |
| 2079 if (toolkit_views) { | 2083 if (toolkit_views) { |
| 2080 sources += [ | 2084 sources += [ |
| (...skipping 1945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4026 "../browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_uni
ttest.cc", | 4030 "../browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_uni
ttest.cc", |
| 4027 "../browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc", | 4031 "../browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc", |
| 4028 "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.
cc", | 4032 "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.
cc", |
| 4029 "../browser/ui/ash/multi_user/user_switch_util_unittest.cc", | 4033 "../browser/ui/ash/multi_user/user_switch_util_unittest.cc", |
| 4030 "../browser/ui/ash/session_state_delegate_chromeos_unittest.cc", | 4034 "../browser/ui/ash/session_state_delegate_chromeos_unittest.cc", |
| 4031 "../browser/ui/ash/system_tray_delegate_chromeos_unittest.cc", | 4035 "../browser/ui/ash/system_tray_delegate_chromeos_unittest.cc", |
| 4032 "../browser/ui/ash/window_positioner_unittest.cc", | 4036 "../browser/ui/ash/window_positioner_unittest.cc", |
| 4033 "../browser/ui/window_sizer/window_sizer_ash_unittest.cc", | 4037 "../browser/ui/window_sizer/window_sizer_ash_unittest.cc", |
| 4034 ] | 4038 ] |
| 4035 deps += [ | 4039 deps += [ |
| 4040 "//ash:ash_with_aura_test_support", |
| 4036 "//ash:test_support_with_content", | 4041 "//ash:test_support_with_content", |
| 4037 "//ash/common/strings", | 4042 "//ash/common/strings", |
| 4038 "//ash/resources", | 4043 "//ash/resources", |
| 4039 ] | 4044 ] |
| 4040 | 4045 |
| 4041 # We eventually want to compile both in Win Aura builds, see | 4046 # We eventually want to compile both in Win Aura builds, see |
| 4042 # http://crbug.com/155545. | 4047 # http://crbug.com/155545. |
| 4043 if (!is_win) { | 4048 if (!is_win) { |
| 4044 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] | 4049 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] |
| 4045 } | 4050 } |
| (...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5004 "touch_hud", | 5009 "touch_hud", |
| 5005 "ui", | 5010 "ui", |
| 5006 ] | 5011 ] |
| 5007 | 5012 |
| 5008 if (is_linux && !is_android) { | 5013 if (is_linux && !is_android) { |
| 5009 deps += [ "//components/font_service:manifest" ] | 5014 deps += [ "//components/font_service:manifest" ] |
| 5010 packaged_services += [ "font_service" ] | 5015 packaged_services += [ "font_service" ] |
| 5011 } | 5016 } |
| 5012 } | 5017 } |
| 5013 } | 5018 } |
| OLD | NEW |