| 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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 687 sources -= [ | 687 sources -= [ |
| 688 # These tests are failing on official cros bots. crbug.com/431450. | 688 # These tests are failing on official cros bots. crbug.com/431450. |
| 689 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | 689 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", |
| 690 ] | 690 ] |
| 691 } | 691 } |
| 692 } else { # ! is_chromeos | 692 } else { # ! is_chromeos |
| 693 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform | 693 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform |
| 694 # panels). | 694 # panels). |
| 695 sources += [ | 695 sources += [ |
| 696 "../browser/notifications/notification_interactive_uitest.cc", | 696 "../browser/notifications/notification_interactive_uitest.cc", |
| 697 "../browser/notifications/notification_interactive_uitest_mac.mm", |
| 698 "../browser/notifications/notification_interactive_uitest_support.cc", |
| 697 "../browser/notifications/platform_notification_service_interactive_uite
st.cc", | 699 "../browser/notifications/platform_notification_service_interactive_uite
st.cc", |
| 698 ] | 700 ] |
| 699 } | 701 } |
| 700 | 702 |
| 701 if (is_win) { | 703 if (is_win) { |
| 702 sources += [ | 704 sources += [ |
| 703 "../browser/downgrade/user_data_downgrade_browsertest.cc", | 705 "../browser/downgrade/user_data_downgrade_browsertest.cc", |
| 704 "//ui/resources/cursors/aliasb.cur", | 706 "//ui/resources/cursors/aliasb.cur", |
| 705 "//ui/resources/cursors/cell.cur", | 707 "//ui/resources/cursors/cell.cur", |
| 706 "//ui/resources/cursors/col_resize.cur", | 708 "//ui/resources/cursors/col_resize.cur", |
| (...skipping 4483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5190 } | 5192 } |
| 5191 | 5193 |
| 5192 if (is_win) { | 5194 if (is_win) { |
| 5193 loadable_module("conflicts_dll") { | 5195 loadable_module("conflicts_dll") { |
| 5194 testonly = true | 5196 testonly = true |
| 5195 sources = [ | 5197 sources = [ |
| 5196 "conflicts/conflicts_dll.cc", | 5198 "conflicts/conflicts_dll.cc", |
| 5197 ] | 5199 ] |
| 5198 } | 5200 } |
| 5199 } | 5201 } |
| OLD | NEW |