| 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 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2081         "../browser/ui/ash/accelerator_commands_browsertest.cc", | 2081         "../browser/ui/ash/accelerator_commands_browsertest.cc", | 
| 2082         "../browser/ui/ash/accelerator_controller_browsertest.cc", | 2082         "../browser/ui/ash/accelerator_controller_browsertest.cc", | 
| 2083         "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", | 2083         "../browser/ui/ash/app_list/app_list_controller_ash_browsertest.cc", | 
| 2084         "../browser/ui/ash/chrome_new_window_client_browsertest.cc", | 2084         "../browser/ui/ash/chrome_new_window_client_browsertest.cc", | 
| 2085         "../browser/ui/ash/keyboard_controller_browsertest.cc", | 2085         "../browser/ui/ash/keyboard_controller_browsertest.cc", | 
| 2086         "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.
      cc", | 2086         "../browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.
      cc", | 
| 2087         "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", | 2087         "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", | 
| 2088         "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", | 2088         "../browser/ui/ash/multi_user/multi_user_window_manager_test.cc", | 
| 2089         "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", | 2089         "../browser/ui/ash/multi_user/multi_user_window_manager_test.h", | 
| 2090         "../browser/ui/ash/shelf_browsertest.cc", | 2090         "../browser/ui/ash/shelf_browsertest.cc", | 
|  | 2091         "../browser/ui/ash/system_tray_client_browsertest.cc", | 
| 2091         "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
      ", | 2092         "../browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
      ", | 
| 2092         "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome
      os.cc", | 2093         "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chrome
      os.cc", | 
| 2093         "../browser/ui/ash/volume_controller_browsertest.cc", | 2094         "../browser/ui/ash/volume_controller_browsertest.cc", | 
| 2094         "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
      .cc", | 2095         "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
      .cc", | 
| 2095       ] | 2096       ] | 
| 2096       deps += [ | 2097       deps += [ | 
| 2097         "//ash/test:ash_with_aura_test_support", | 2098         "//ash/test:ash_with_aura_test_support", | 
| 2098         "//ash/test:test_support_with_content", | 2099         "//ash/test:test_support_with_content", | 
| 2099       ] | 2100       ] | 
| 2100 | 2101 | 
| (...skipping 3024 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5125 } | 5126 } | 
| 5126 | 5127 | 
| 5127 if (is_win) { | 5128 if (is_win) { | 
| 5128   loadable_module("conflicts_dll") { | 5129   loadable_module("conflicts_dll") { | 
| 5129     testonly = true | 5130     testonly = true | 
| 5130     sources = [ | 5131     sources = [ | 
| 5131       "conflicts/conflicts_dll.cc", | 5132       "conflicts/conflicts_dll.cc", | 
| 5132     ] | 5133     ] | 
| 5133   } | 5134   } | 
| 5134 } | 5135 } | 
| OLD | NEW | 
|---|