| 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("ash.gyp") ], | 10 [ rebase_path("ash.gyp") ], |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 } else { | 77 } else { |
| 78 sources -= [ | 78 sources -= [ |
| 79 "host/ash_window_tree_host_x11.cc", | 79 "host/ash_window_tree_host_x11.cc", |
| 80 "host/ash_window_tree_host_x11.h", | 80 "host/ash_window_tree_host_x11.h", |
| 81 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", | 81 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", |
| 82 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", | 82 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", |
| 83 ] | 83 ] |
| 84 } | 84 } |
| 85 | 85 |
| 86 if (use_ozone) { | 86 if (use_ozone) { |
| 87 deps += [ "//ui/ozone" ] | 87 deps += [ |
| 88 "//ui/events/ozone:events_ozone", |
| 89 "//ui/ozone", |
| 90 ] |
| 88 } | 91 } |
| 89 | 92 |
| 90 if (is_chromeos) { | 93 if (is_chromeos) { |
| 91 deps += [ | 94 deps += [ |
| 92 "//device/bluetooth", | 95 "//device/bluetooth", |
| 93 "//ui/display", | 96 "//ui/display", |
| 94 "//ui/display/util", | 97 "//ui/display/util", |
| 95 "//chromeos", | 98 "//chromeos", |
| 96 "//chromeos:power_manager_proto", | 99 "//chromeos:power_manager_proto", |
| 97 "//ui/chromeos/resources", | 100 "//ui/chromeos/resources", |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 "//skia", | 390 "//skia", |
| 388 "//testing/gtest", | 391 "//testing/gtest", |
| 389 "//ui/accessibility", | 392 "//ui/accessibility", |
| 390 ] | 393 ] |
| 391 | 394 |
| 392 if (is_chromeos) { | 395 if (is_chromeos) { |
| 393 deps += [ "//ui/display" ] | 396 deps += [ "//ui/display" ] |
| 394 } | 397 } |
| 395 } | 398 } |
| 396 } | 399 } |
| OLD | NEW |