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) { |
78 deps += [ "//ui/ozone" ] | 86 deps += [ "//ui/ozone" ] |
| 87 } else { |
| 88 sources -= [ |
| 89 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc", |
| 90 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h", |
| 91 ] |
79 } | 92 } |
80 | 93 |
81 if (is_chromeos) { | 94 if (is_chromeos) { |
82 deps += [ | 95 deps += [ |
83 "//device/bluetooth", | 96 "//device/bluetooth", |
84 "//ui/display", | 97 "//ui/display", |
85 "//ui/display/util", | 98 "//ui/display/util", |
86 "//chromeos", | 99 "//chromeos", |
87 "//chromeos:power_manager_proto", | 100 "//chromeos:power_manager_proto", |
88 "//ui/chromeos/resources", | 101 "//ui/chromeos/resources", |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 "//content/test:test_support", | 385 "//content/test:test_support", |
373 "//skia", | 386 "//skia", |
374 "//testing/gtest", | 387 "//testing/gtest", |
375 "//ui/accessibility", | 388 "//ui/accessibility", |
376 ] | 389 ] |
377 | 390 |
378 if (is_chromeos) { | 391 if (is_chromeos) { |
379 deps += [ "//ui/display" ] | 392 deps += [ "//ui/display" ] |
380 } | 393 } |
381 } | 394 } |
OLD | NEW |