ui/base/clipboard/clipboard.h - Issue 113763003: Add use_clibpard_aurax11 gyp flag to allow chromeos-chrome to access X11 Clipboard

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/base/clipboard/clipboard.h

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

Index: ui/base/clipboard/clipboard.h

diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h

index d3fbbaa63a6e1c0f429cb5b7cdd0fc6dd083c642..f41ac7a8bf532fdebae03ce7ac65d741be16d06d 100644

--- a/ui/base/clipboard/clipboard.h

+++ b/ui/base/clipboard/clipboard.h

@@ -384,7 +384,7 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {

TargetMap* clipboard_data_;

GtkClipboard* clipboard_;

GtkClipboard* primary_selection_;

-#elif defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)

+#elif defined(USE_CLIPBOARD_AURAX11)

private:

// We keep our implementation details private because otherwise we bring in

// the X11 headers and break chrome compile.

« no previous file with comments | « build/common.gypi ('k') | ui/ui.gyp » ('j') | no next file with comments »