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

Side by Side Diff: ui/ui.gyp

Issue 113763003: Add use_clibpard_aurax11 gyp flag to allow chromeos-chrome to access X11 Clipboard (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/base/clipboard/clipboard.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 ['include', '^base/dragdrop/os_exchange_data.cc'], 418 ['include', '^base/dragdrop/os_exchange_data.cc'],
419 ], 419 ],
420 }], 420 }],
421 ], 421 ],
422 }], 422 }],
423 ['use_pango==1', { 423 ['use_pango==1', {
424 'dependencies': [ 424 'dependencies': [
425 '../build/linux/system.gyp:pangocairo', 425 '../build/linux/system.gyp:pangocairo',
426 ], 426 ],
427 }], 427 }],
428 ['use_x11==0 or use_clipboard_aurax11==1', {
429 'sources!': [
430 'base/clipboard/clipboard_aura.cc',
431 ],
432 }, {
433 'sources!': [
434 'base/clipboard/clipboard_aurax11.cc',
435 ],
436 }],
428 ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', { 437 ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
429 'sources!': [ 438 'sources!': [
430 'base/clipboard/clipboard_aurax11.cc',
431 'base/dragdrop/os_exchange_data_provider_aurax11.cc', 439 'base/dragdrop/os_exchange_data_provider_aurax11.cc',
432 'base/touch/touch_device.cc', 440 'base/touch/touch_device.cc',
433 ], 441 ],
434 }, { 442 }, {
435 'sources!': [ 443 'sources!': [
436 'base/clipboard/clipboard_aura.cc',
437 'base/dragdrop/os_exchange_data_provider_aura.cc', 444 'base/dragdrop/os_exchange_data_provider_aura.cc',
438 'base/dragdrop/os_exchange_data_provider_aura.h', 445 'base/dragdrop/os_exchange_data_provider_aura.h',
439 'base/touch/touch_device_aurax11.cc', 446 'base/touch/touch_device_aurax11.cc',
440 ], 447 ],
441 }], 448 }],
442 ['OS=="win"', { 449 ['OS=="win"', {
443 'sources!': [ 450 'sources!': [
444 'base/touch/touch_device.cc', 451 'base/touch/touch_device.cc',
445 ], 452 ],
446 'include_dirs': [ 453 'include_dirs': [
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 'xcode_settings': { 691 'xcode_settings': {
685 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 692 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
686 }, 693 },
687 }], 694 }],
688 ], 695 ],
689 }, 696 },
690 ], 697 ],
691 }], 698 }],
692 ], 699 ],
693 } 700 }
OLDNEW
« no previous file with comments | « ui/base/clipboard/clipboard.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698