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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/ui.gyp

Issue 8364037: Implement clipboard for aura and re-enable clipboard_unittests. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: modified accordingto comments Created 9 years, 2 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
« ui/base/clipboard/clipboard_aurax11.cc ('K') | « ui/base/clipboard/clipboard_unittest.cc ('k') | ui/ui_unittests.gypi » ('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 501a3685f6d519278bb967f78121484241beb21b..b8e7581a1271d9e3059dea1eda0d5dc6d192e197 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -75,7 +75,7 @@
'base/animation/tween.h',
'base/clipboard/clipboard.cc',
'base/clipboard/clipboard.h',
- 'base/clipboard/clipboard_aura.cc',
+ 'base/clipboard/clipboard_aurax11.cc',
'base/clipboard/clipboard_gtk.cc',
'base/clipboard/clipboard_mac.mm',
'base/clipboard/clipboard_util_win.cc',
@@ -396,7 +396,7 @@
'gfx/gtk_util.h',
],
'sources!': [
- 'base/clipboard/clipboard_aura.cc',
+ 'base/clipboard/clipboard_aurax11.cc',
],
}, { # toolkit_uses_gtk != 1
'sources!': [
@@ -439,7 +439,7 @@
'gfx/win_util.h',
],
'sources!': [
- 'base/clipboard/clipboard_aura.cc',
+ 'base/clipboard/clipboard_aurax11.cc',
'base/touch/touch_factory.cc',
'base/touch/touch_factory.h',
'gfx/pango_util.h',
« ui/base/clipboard/clipboard_aurax11.cc ('K') | « ui/base/clipboard/clipboard_unittest.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698