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

Unified Diff: ui/ui.gyp

Issue 10829341: Desktop aura: Use the X11 clipboard (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix MessageLoop ordering in tests. Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/x/x11_atom_cache.cc ('k') | ui/views/widget/x11_desktop_handler.h » ('j') | 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 b0b418f4d55c91c23cca71b29754908a416ac61a..01354724a98af44f90ba2b2ab54b125b75868d18 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -109,6 +109,7 @@
'base/clipboard/clipboard.h',
'base/clipboard/clipboard_android.cc',
'base/clipboard/clipboard_aurax11.cc',
+ 'base/clipboard/clipboard_chromeos.cc',
'base/clipboard/clipboard_gtk.cc',
'base/clipboard/clipboard_mac.mm',
'base/clipboard/clipboard_util_win.cc',
@@ -368,6 +369,8 @@
'base/x/valuators.h',
'base/x/work_area_watcher_x.cc',
'base/x/work_area_watcher_x.h',
+ 'base/x/x11_atom_cache.cc',
+ 'base/x/x11_atom_cache.h',
'base/x/x11_util.cc',
'base/x/x11_util.h',
'base/x/x11_util_internal.h',
@@ -640,6 +643,11 @@
'base/native_theme/native_theme_gtk.h',
]
}],
+ ['chromeos==1', {
+ 'sources!': [
+ 'base/clipboard/clipboard_aurax11.cc',
+ ],
+ }],
['OS=="win"', {
'sources': [
'gfx/gdi_util.cc',
« no previous file with comments | « ui/base/x/x11_atom_cache.cc ('k') | ui/views/widget/x11_desktop_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698