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

Unified Diff: ui/aura/desktop.cc

Issue 8566037: aura: Fix unit_tests on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove Synthetic tests that were added for NWViews Created 9 years, 1 month 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/aura/desktop.cc
diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc
index 90ee1716fc309bb76a50e7dfeace8cd369d75bda..d49b76ff60c1c6e51bcba9cefabffaa24ce943e6 100644
--- a/ui/aura/desktop.cc
+++ b/ui/aura/desktop.cc
@@ -32,10 +32,6 @@
#include "ui/gfx/compositor/compositor_cc.h"
#endif
-#if defined(USE_X11)
-#include "base/message_pump_x.h"
-#endif
-
using std::string;
using std::vector;
@@ -424,16 +420,9 @@ Desktop::Desktop()
host_->GetSize());
}
DCHECK(compositor_.get());
-#if defined(USE_X11)
- base::MessagePumpX::SetDefaultDispatcher(host_.get());
-#endif
}
Desktop::~Desktop() {
-#if defined(USE_X11)
- base::MessagePumpX::SetDefaultDispatcher(NULL);
-#endif
-
in_destructor_ = true;
#ifdef USE_WEBKIT_COMPOSITOR
if (!ui::Compositor::compositor_factory())

Powered by Google App Engine
This is Rietveld 408576698