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

Unified Diff: ui/aura/env.cc

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/env.h ('k') | ui/aura/root_window_host_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/env.cc
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 6c40697adde3c6d1e73d6b6f9554785f609c2b13..e787c9957b1fb2e2ebaee34c6d552247e9566698 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -115,7 +115,7 @@ MessageLoop::Dispatcher* Env::GetDispatcher() {
// Env, private:
void Env::Init() {
-#if defined(OS_WIN)
+#if !defined(USE_X11)
dispatcher_.reset(CreateDispatcher());
#endif
#if defined(USE_X11)
« no previous file with comments | « ui/aura/env.h ('k') | ui/aura/root_window_host_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698