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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/clipboard/clipboard.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index f939a65eae8c4deefaf509b593c192ae6c909d85..92d05c36383817d6ac5e6f70e5ffe973a3982f98 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -425,15 +425,22 @@
'../build/linux/system.gyp:pangocairo',
],
}],
- ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
+ ['use_x11==0 or use_clipboard_aurax11==1', {
+ 'sources!': [
+ 'base/clipboard/clipboard_aura.cc',
+ ],
+ }, {
'sources!': [
'base/clipboard/clipboard_aurax11.cc',
+ ],
+ }],
+ ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
+ 'sources!': [
'base/dragdrop/os_exchange_data_provider_aurax11.cc',
'base/touch/touch_device.cc',
],
}, {
'sources!': [
- 'base/clipboard/clipboard_aura.cc',
'base/dragdrop/os_exchange_data_provider_aura.cc',
'base/dragdrop/os_exchange_data_provider_aura.h',
'base/touch/touch_device_aurax11.cc',
« 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