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

Unified Diff: ui/views/widget/x11_window_event_filter.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/x11_desktop_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/x11_window_event_filter.h
diff --git a/ui/views/widget/x11_window_event_filter.h b/ui/views/widget/x11_window_event_filter.h
index 01c5bd554086bc4a1bcac96ea71df9ed292bb9e6..edbf03d21119368617f7dd8632846ed5eb694082 100644
--- a/ui/views/widget/x11_window_event_filter.h
+++ b/ui/views/widget/x11_window_event_filter.h
@@ -12,7 +12,7 @@
#include "base/compiler_specific.h"
#include "base/message_loop.h"
#include "ui/aura/event_filter.h"
-#include "ui/aura/x11_atom_cache.h"
+#include "ui/base/x/x11_atom_cache.h"
#include "ui/views/views_export.h"
namespace aura {
@@ -64,7 +64,7 @@ class VIEWS_EXPORT X11WindowEventFilter : public aura::EventFilter {
// The native root window.
::Window x_root_window_;
- aura::X11AtomCache atom_cache_;
+ ui::X11AtomCache atom_cache_;
// True if |xwindow_| is the current _NET_ACTIVE_WINDOW.
bool is_active_;
« no previous file with comments | « ui/views/widget/x11_desktop_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698