| 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 | 7 |
| 8 gypi_values = exec_script("//build/gypi_to_gn.py", | 8 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 9 [ rebase_path("ash.gyp") ], | 9 [ rebase_path("ash.gyp") ], |
| 10 "scope", | 10 "scope", |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 sources -= [ | 57 sources -= [ |
| 58 "sticky_keys/sticky_keys_controller.cc", | 58 "sticky_keys/sticky_keys_controller.cc", |
| 59 "sticky_keys/sticky_keys_controller.h", | 59 "sticky_keys/sticky_keys_controller.h", |
| 60 ] | 60 ] |
| 61 | 61 |
| 62 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 62 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 63 cflags = [ "/wd4267" ] | 63 cflags = [ "/wd4267" ] |
| 64 } | 64 } |
| 65 | 65 |
| 66 if (use_x11) { | 66 if (use_x11) { |
| 67 configs += [ "//build/config/linux:xfixes" ] | 67 configs += [ |
| 68 "//build/config/linux:x11", |
| 69 "//build/config/linux:xfixes", |
| 70 ] |
| 71 deps += [ |
| 72 "//ui/events:gesture_detection", |
| 73 "//ui/events/platform", |
| 74 "//ui/gfx/x", |
| 75 ] |
| 68 } else { | 76 } else { |
| 69 sources -= [ | 77 sources -= [ |
| 70 "host/ash_window_tree_host_x11.cc", | 78 "host/ash_window_tree_host_x11.cc", |
| 71 "host/ash_window_tree_host_x11.h", | 79 "host/ash_window_tree_host_x11.h", |
| 72 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", | 80 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", |
| 73 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", | 81 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", |
| 74 ] | 82 ] |
| 75 } | 83 } |
| 76 | 84 |
| 77 if (use_ozone) { | 85 if (use_ozone) { |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 "//content/test:test_support", | 384 "//content/test:test_support", |
| 377 "//skia", | 385 "//skia", |
| 378 "//testing/gtest", | 386 "//testing/gtest", |
| 379 "//ui/accessibility", | 387 "//ui/accessibility", |
| 380 ] | 388 ] |
| 381 | 389 |
| 382 if (is_chromeos) { | 390 if (is_chromeos) { |
| 383 deps += [ "//ui/display" ] | 391 deps += [ "//ui/display" ] |
| 384 } | 392 } |
| 385 } | 393 } |
| OLD | NEW |