| 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/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
| 8 | 8 |
| 9 gypi_values = exec_script("//build/gypi_to_gn.py", | 9 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 10 [ rebase_path("views.gyp") ], | 10 [ rebase_path("views.gyp") ], |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 sources += gypi_values.views_desktop_aura_ozone_sources | 125 sources += gypi_values.views_desktop_aura_ozone_sources |
| 126 } | 126 } |
| 127 if (is_linux) { | 127 if (is_linux) { |
| 128 sources += gypi_values.views_desktop_aura_linux_sources | 128 sources += gypi_values.views_desktop_aura_linux_sources |
| 129 } | 129 } |
| 130 } | 130 } |
| 131 } | 131 } |
| 132 | 132 |
| 133 if (is_mac) { | 133 if (is_mac) { |
| 134 deps += [ | 134 deps += [ |
| 135 "//third_party/google_toolbox_for_mac", |
| 135 "//ui/accelerated_widget_mac", | 136 "//ui/accelerated_widget_mac", |
| 136 "//ui/events:dom_keycode_converter", | 137 "//ui/events:dom_keycode_converter", |
| 137 ] | 138 ] |
| 138 libs = [ | 139 libs = [ |
| 139 # Required by bridged_native_widget.mm. | 140 # Required by bridged_native_widget.mm. |
| 140 "QuartzCore.framework", | 141 "QuartzCore.framework", |
| 141 ] | 142 ] |
| 142 } | 143 } |
| 143 } | 144 } |
| 144 | 145 |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 sources += gypi_values.views_unittests_desktop_sources | 284 sources += gypi_values.views_unittests_desktop_sources |
| 284 } | 285 } |
| 285 | 286 |
| 286 if (is_mac) { | 287 if (is_mac) { |
| 287 # views_unittests not yet compiling on Mac. http://crbug.com/378134 | 288 # views_unittests not yet compiling on Mac. http://crbug.com/378134 |
| 288 sources -= [ | 289 sources -= [ |
| 289 "bubble/bubble_window_targeter_unittest.cc", | 290 "bubble/bubble_window_targeter_unittest.cc", |
| 290 "controls/native/native_view_host_unittest.cc", | 291 "controls/native/native_view_host_unittest.cc", |
| 291 "widget/window_reorderer_unittest.cc", | 292 "widget/window_reorderer_unittest.cc", |
| 292 ] | 293 ] |
| 293 deps += [ "//ui/accelerated_widget_mac" ] | 294 deps += [ |
| 295 "//third_party/google_toolbox_for_mac", |
| 296 "//ui/accelerated_widget_mac", |
| 297 ] |
| 294 } | 298 } |
| 295 } | 299 } |
| 296 | 300 |
| 297 if (is_mac) { | 301 if (is_mac) { |
| 298 test("macviews_interactive_ui_tests") { | 302 test("macviews_interactive_ui_tests") { |
| 299 sources = [ | 303 sources = [ |
| 300 "cocoa/bridged_native_widget_interactive_uitest.mm", | 304 "cocoa/bridged_native_widget_interactive_uitest.mm", |
| 301 "run_all_unittests.cc", | 305 "run_all_unittests.cc", |
| 302 "widget/native_widget_mac_interactive_uitest.mm", | 306 "widget/native_widget_mac_interactive_uitest.mm", |
| 303 ] | 307 ] |
| 304 deps = [ | 308 deps = [ |
| 305 ":test_support", | 309 ":test_support", |
| 306 ":views", | 310 ":views", |
| 307 "//base", | 311 "//base", |
| 308 "//base/test:test_support", | 312 "//base/test:test_support", |
| 309 "//skia", | 313 "//skia", |
| 310 "//testing/gtest", | 314 "//testing/gtest", |
| 311 "//ui/base:test_support", | 315 "//ui/base:test_support", |
| 312 "//ui/compositor", | 316 "//ui/compositor", |
| 313 "//ui/events:test_support", | 317 "//ui/events:test_support", |
| 314 "//ui/gl:test_support", | 318 "//ui/gl:test_support", |
| 315 "//ui/resources", | 319 "//ui/resources", |
| 316 "//ui/resources:ui_test_pak", | 320 "//ui/resources:ui_test_pak", |
| 317 "//ui/strings", | 321 "//ui/strings", |
| 318 ] | 322 ] |
| 319 } | 323 } |
| 320 } | 324 } |
| OLD | NEW |