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

Side by Side Diff: ash/BUILD.gn

Issue 567413003: Revert of Remove deprecated cursor event filter for Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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') | no next file with comments »
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( 8 gypi_values = exec_script(
9 "//build/gypi_to_gn.py", 9 "//build/gypi_to_gn.py",
10 [ rebase_path("ash.gyp") ], 10 [ rebase_path("ash.gyp") ],
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 if (!use_x11 || !is_chromeos) { 106 if (!use_x11 || !is_chromeos) {
107 sources -= [ 107 sources -= [
108 "touch/touch_transformer_controller.cc", 108 "touch/touch_transformer_controller.cc",
109 "touch/touch_transformer_controller.h", 109 "touch/touch_transformer_controller.h",
110 "touch/touchscreen_util.cc", 110 "touch/touchscreen_util.cc",
111 "touch/touchscreen_util.h", 111 "touch/touchscreen_util.h",
112 ] 112 ]
113 } 113 }
114 114
115 if (!use_ozone) {
116 sources -= [
117 "display/mouse_cursor_event_filter_ozone.cc",
118 ]
119 }
120
115 if (!use_ozone) { 121 if (!use_ozone) {
116 sources -= [ 122 sources -= [
117 "host/ash_window_tree_host_ozone.cc", 123 "host/ash_window_tree_host_ozone.cc",
118 ] 124 ]
119 } 125 }
120 } 126 }
121 127
122 component("ash_with_content") { 128 component("ash_with_content") {
123 sources = [ 129 sources = [
124 "content_support/ash_with_content_export.h", 130 "content_support/ash_with_content_export.h",
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 "//content/test:test_support", 380 "//content/test:test_support",
375 "//skia", 381 "//skia",
376 "//testing/gtest", 382 "//testing/gtest",
377 "//ui/accessibility", 383 "//ui/accessibility",
378 ] 384 ]
379 385
380 if (is_chromeos) { 386 if (is_chromeos) {
381 deps += [ "//ui/display" ] 387 deps += [ "//ui/display" ]
382 } 388 }
383 } 389 }
OLDNEW
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698