ui/ui.gyp - Issue 8364037: Implement clipboard for aura and re-enable clipboard_unittests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 according to 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:

Index: ui/ui.gyp

diff --git a/ui/ui.gyp b/ui/ui.gyp

index 7544545a9cc032967a2dcdda6ea9867977eb9a52..7f99b8b5e33bfbb896b9897b87669c9ca996d13c 100644

--- a/ui/ui.gyp

+++ b/ui/ui.gyp

@@ -68,7 +68,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',

@@ -388,9 +388,6 @@

'gfx/gtk_util.cc',

'gfx/gtk_util.h',

- 'sources!': [

- 'base/clipboard/clipboard_aura.cc',

- ],

}, { # toolkit_uses_gtk != 1

'sources!': [

'gfx/native_theme_gtk.cc',

@@ -432,7 +429,6 @@

'gfx/win_util.h',

'sources!': [

- 'base/clipboard/clipboard_aura.cc',

'base/touch/touch_factory.cc',

'base/touch/touch_factory.h',

'gfx/pango_util.h',

« no previous file with comments | « ui/base/clipboard/clipboard_unittest.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »