Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Side by Side Diff: ash/BUILD.gn

Issue 806693009: Port ScopedDisableInternalMouseAndKeyboardX11 to Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | ui/events/ozone/evdev/event_converter_evdev_impl.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 configs += [ "//build/config/linux:xfixes" ] 67 configs += [ "//build/config/linux:xfixes" ]
68 } else { 68 } else {
69 sources -= [ 69 sources -= [
70 "host/ash_window_tree_host_x11.cc", 70 "host/ash_window_tree_host_x11.cc",
71 "host/ash_window_tree_host_x11.h", 71 "host/ash_window_tree_host_x11.h",
72 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", 72 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
73 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", 73 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
74 ] 74 ]
75 } 75 }
76 76
77 if (use_ozone) {
78 deps += [ "//ui/ozone" ]
79 }
80
77 if (is_chromeos) { 81 if (is_chromeos) {
78 deps += [ 82 deps += [
79 "//device/bluetooth", 83 "//device/bluetooth",
80 "//ui/display", 84 "//ui/display",
81 "//ui/display/util", 85 "//ui/display/util",
82 "//chromeos", 86 "//chromeos",
83 "//chromeos:power_manager_proto", 87 "//chromeos:power_manager_proto",
84 "//ui/chromeos/resources", 88 "//ui/chromeos/resources",
85 "//ui/chromeos/strings", 89 "//ui/chromeos/strings",
86 "//ui/chromeos:ui_chromeos", 90 "//ui/chromeos:ui_chromeos",
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 "//content/test:test_support", 371 "//content/test:test_support",
368 "//skia", 372 "//skia",
369 "//testing/gtest", 373 "//testing/gtest",
370 "//ui/accessibility", 374 "//ui/accessibility",
371 ] 375 ]
372 376
373 if (is_chromeos) { 377 if (is_chromeos) {
374 deps += [ "//ui/display" ] 378 deps += [ "//ui/display" ]
375 } 379 }
376 } 380 }
OLDNEW
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | ui/events/ozone/evdev/event_converter_evdev_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698