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

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: merge 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
« no previous file with comments | « chrome/browser/ui/views/accessibility_event_router_views_unittest.cc ('k') | ui/aura/desktop_host_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop.cc
diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc
index 59cd9623729825fcb0851b88430012b3bb84850a..b3cd1058f2d5f7e12018cbe5ef50bd592831a8ed 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;
@@ -429,16 +425,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())
« no previous file with comments | « chrome/browser/ui/views/accessibility_event_router_views_unittest.cc ('k') | ui/aura/desktop_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698