ui/views/widget/x11_desktop_handler.h - Issue 10829341: Desktop aura: Use the 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/views/widget/x11_desktop_handler.h

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:

Index: ui/views/widget/x11_desktop_handler.h

diff --git a/ui/views/widget/x11_desktop_handler.h b/ui/views/widget/x11_desktop_handler.h

index 5c93c076d64a03ccec33bd9eb4e0530ea2467646..21690f8b02e14df4cfb74f280bbc94f74c75d059 100644

--- a/ui/views/widget/x11_desktop_handler.h

+++ b/ui/views/widget/x11_desktop_handler.h

@@ -11,7 +11,7 @@

#include "base/message_loop.h"

#include "ui/aura/env_observer.h"

-#include "ui/aura/x11_atom_cache.h"

+#include "ui/base/x/x11_atom_cache.h"

#include "ui/views/views_export.h"

template <typename T> struct DefaultSingletonTraits;

@@ -59,7 +59,7 @@ class VIEWS_EXPORT X11DesktopHandler : public MessageLoop::Dispatcher,

// The native root window.

::Window x_root_window_;

- aura::X11AtomCache atom_cache_;

+ ui::X11AtomCache atom_cache_;

// Global focus/activation managers.

scoped_ptr<aura::FocusManager> focus_manager_;

« no previous file with comments | « ui/ui.gyp ('k') | ui/views/widget/x11_window_event_filter.h » ('j') | no next file with comments »