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

Side by Side Diff: ui/base/ui_base.gyp

Issue 815983003: Unified touch_device_aurax11 and touch_device_ozone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased with master Created 5 years, 11 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
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 'resource/resource_handle.h', 345 'resource/resource_handle.h',
346 'text/bytes_formatting.cc', 346 'text/bytes_formatting.cc',
347 'text/bytes_formatting.h', 347 'text/bytes_formatting.h',
348 'theme_provider.cc', 348 'theme_provider.cc',
349 'theme_provider.h', 349 'theme_provider.h',
350 'touch/selection_bound.cc', 350 'touch/selection_bound.cc',
351 'touch/selection_bound.h', 351 'touch/selection_bound.h',
352 'touch/touch_device.cc', 352 'touch/touch_device.cc',
353 'touch/touch_device.h', 353 'touch/touch_device.h',
354 'touch/touch_device_android.cc', 354 'touch/touch_device_android.cc',
355 'touch/touch_device_aurax11.cc', 355 'touch/touch_device_linux.cc',
356 'touch/touch_device_ozone.cc',
357 'touch/touch_device_win.cc', 356 'touch/touch_device_win.cc',
358 'touch/touch_editing_controller.cc', 357 'touch/touch_editing_controller.cc',
359 'touch/touch_editing_controller.h', 358 'touch/touch_editing_controller.h',
360 'touch/touch_enabled.cc', 359 'touch/touch_enabled.cc',
361 'touch/touch_enabled.h', 360 'touch/touch_enabled.h',
362 'ui_base_export.h', 361 'ui_base_export.h',
363 'ui_base_exports.cc', 362 'ui_base_exports.cc',
364 'ui_base_paths.cc', 363 'ui_base_paths.cc',
365 'ui_base_paths.h', 364 'ui_base_paths.h',
366 'ui_base_switches.cc', 365 'ui_base_switches.cc',
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 }], 528 }],
530 ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', { 529 ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
531 'sources!': [ 530 'sources!': [
532 'dragdrop/os_exchange_data_provider_aurax11.cc', 531 'dragdrop/os_exchange_data_provider_aurax11.cc',
533 'touch/touch_device.cc', 532 'touch/touch_device.cc',
534 ], 533 ],
535 }, { 534 }, {
536 'sources!': [ 535 'sources!': [
537 'dragdrop/os_exchange_data_provider_aura.cc', 536 'dragdrop/os_exchange_data_provider_aura.cc',
538 'dragdrop/os_exchange_data_provider_aura.h', 537 'dragdrop/os_exchange_data_provider_aura.h',
539 'touch/touch_device_aurax11.cc', 538 'touch/touch_device_linux.cc',
540 ], 539 ],
541 }], 540 }],
542 ['OS=="win"', { 541 ['OS=="win"', {
543 'sources!': [ 542 'sources!': [
544 'touch/touch_device.cc', 543 'touch/touch_device.cc',
545 ], 544 ],
546 'include_dirs': [ 545 'include_dirs': [
547 '../..', 546 '../..',
548 '../../third_party/wtl/include', 547 '../../third_party/wtl/include',
549 ], 548 ],
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 ], 791 ],
793 'variables': { 792 'variables': {
794 'jni_gen_package': 'ui', 793 'jni_gen_package': 'ui',
795 }, 794 },
796 'includes': [ '../../build/jni_generator.gypi' ], 795 'includes': [ '../../build/jni_generator.gypi' ],
797 }, 796 },
798 ], 797 ],
799 }], 798 }],
800 ], 799 ],
801 } 800 }
OLDNEW
« ui/base/touch/touch_device_linux.cc ('K') | « ui/base/touch/touch_device_ozone.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698