| 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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 532       ] | 532       ] | 
| 533       if (!is_mac || mac_views_browser) { | 533       if (!is_mac || mac_views_browser) { | 
| 534         # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources | 534         # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources | 
| 535         # when the corresponding files are moved in chrome_browser_ui.gypi | 535         # when the corresponding files are moved in chrome_browser_ui.gypi | 
| 536         # (i.e. out of chrome_browser_ui_views_non_mac_sources). | 536         # (i.e. out of chrome_browser_ui_views_non_mac_sources). | 
| 537         sources += [ | 537         sources += [ | 
| 538           "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | 538           "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | 
| 539           "../browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h", | 539           "../browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h", | 
| 540           "../browser/ui/views/certificate_selector_browsertest.cc", | 540           "../browser/ui/views/certificate_selector_browsertest.cc", | 
| 541           "../browser/ui/views/constrained_window_views_browsertest.cc", | 541           "../browser/ui/views/constrained_window_views_browsertest.cc", | 
|  | 542           "../browser/ui/views/exclusive_access_bubble_views_interactive_uitest.
      cc", | 
| 542           "../browser/ui/views/extensions/extension_dialog_interactive_uitest.cc
      ", | 543           "../browser/ui/views/extensions/extension_dialog_interactive_uitest.cc
      ", | 
| 543           "../browser/ui/views/find_bar_views_interactive_uitest.cc", | 544           "../browser/ui/views/find_bar_views_interactive_uitest.cc", | 
| 544           "../browser/ui/views/frame/browser_view_focus_uitest.cc", | 545           "../browser/ui/views/frame/browser_view_focus_uitest.cc", | 
| 545           "../browser/ui/views/frame/browser_view_interactive_uitest.cc", | 546           "../browser/ui/views/frame/browser_view_interactive_uitest.cc", | 
| 546           "../browser/ui/views/keyboard_access_browsertest.cc", | 547           "../browser/ui/views/keyboard_access_browsertest.cc", | 
| 547           "../browser/ui/views/location_bar/location_icon_view_interactive_uites
      t.cc", | 548           "../browser/ui/views/location_bar/location_icon_view_interactive_uites
      t.cc", | 
| 548           "../browser/ui/views/location_bar/star_view_browsertest.cc", | 549           "../browser/ui/views/location_bar/star_view_browsertest.cc", | 
| 549           "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc", | 550           "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc", | 
| 550           "../browser/ui/views/page_info/page_info_bubble_view_interactive_uites
      t.cc", | 551           "../browser/ui/views/page_info/page_info_bubble_view_interactive_uites
      t.cc", | 
| 551           "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_
      uitest.cc", | 552           "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_
      uitest.cc", | 
| (...skipping 4478 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5030 } | 5031 } | 
| 5031 | 5032 | 
| 5032 if (is_win) { | 5033 if (is_win) { | 
| 5033   loadable_module("conflicts_dll") { | 5034   loadable_module("conflicts_dll") { | 
| 5034     testonly = true | 5035     testonly = true | 
| 5035     sources = [ | 5036     sources = [ | 
| 5036       "conflicts/conflicts_dll.cc", | 5037       "conflicts/conflicts_dll.cc", | 
| 5037     ] | 5038     ] | 
| 5038   } | 5039   } | 
| 5039 } | 5040 } | 
| OLD | NEW | 
|---|