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

Unified Diff: ui/aura/env.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/aura/aura.gyp ('k') | ui/aura/env.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 0c25b6a6968487e398bd0d1a66aa90dc27a911f4..394bf34fe303c79d022c50be01846e6519f1a23c 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -26,7 +26,7 @@ namespace internal {
class DisplayChangeObserverX11;
}
-#if !defined(OS_MACOSX)
+#if !defined(USE_X11)
// Creates a platform-specific native event dispatcher.
MessageLoop::Dispatcher* CreateDispatcher();
#endif
@@ -100,7 +100,7 @@ class AURA_EXPORT Env {
void NotifyWindowInitialized(Window* window);
ObserverList<EnvObserver> observers_;
-#if defined(OS_WIN)
+#if !defined(USE_X11)
scoped_ptr<MessageLoop::Dispatcher> dispatcher_;
#endif
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/env.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698