DefaultDispatcher for MessagePumpX

ui/aura/desktop.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/desktop.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 
 #ifdef USE_WEBKIT_COMPOSITOR
 #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;
 
 namespace aura {
 
 namespace {
 
 // Default bounds for the host window.
 static const int kDefaultHostWindowX = 200;
 static const int kDefaultHostWindowY = 200;
@@ skipping 49 matching lines @@
       filters->push_back(window->event_filter());
     window = window->parent();
   }
 }
 
 }  // namespace
 
 Desktop* Desktop::instance_ = NULL;
 bool Desktop::use_fullscreen_host_window_ = false;
 
-Desktop::Desktop()
-    : Window(NULL),
-      host_(aura::DesktopHost::Create(GetInitialHostWindowBounds())),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          stacking_client_(new DefaultStackingClient(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)),
-      active_window_(NULL),
-      mouse_button_flags_(0),
-      last_cursor_(kCursorNull),
-      in_destructor_(false),
-      screen_(new ScreenAura),
-      capture_window_(NULL),
-      mouse_pressed_handler_(NULL),
-      mouse_moved_handler_(NULL),
-      focused_window_(NULL),
-      touch_event_handler_(NULL) {
-  set_name("RootWindow");
-  gfx::Screen::SetInstance(screen_);
-  host_->SetDesktop(this);
-  last_mouse_location_ = host_->QueryMouseLocation();
-
-  if (ui::Compositor::compositor_factory()) {
-    compositor_ = (*ui::Compositor::compositor_factory())(this);
-  } else {
-#ifdef USE_WEBKIT_COMPOSITOR
-    ui::CompositorCC::Initialize(false);
-#endif
-    compositor_ = ui::Compositor::Create(this, host_->GetAcceleratedWidget(),
-                                         host_->GetSize());
-  }
-  DCHECK(compositor_.get());
-}
-
-Desktop::~Desktop() {
-  in_destructor_ = true;
-#ifdef USE_WEBKIT_COMPOSITOR
-  if (!ui::Compositor::compositor_factory())
-    ui::CompositorCC::Terminate();
-#endif
-  if (instance_ == this)
-    instance_ = NULL;
-}
+////////////////////////////////////////////////////////////////////////////////
+// Desktop, public:
 
 // static
 Desktop* Desktop::GetInstance() {
   if (!instance_) {
     instance_ = new Desktop;
     instance_->Init();
   }
   return instance_;
 }
 
 // static
-void Desktop::DeleteInstanceForTesting() {
+void Desktop::DeleteInstance() {
   delete instance_;
   instance_ = NULL;
 }
 
 void Desktop::SetStackingClient(StackingClient* stacking_client) {
   stacking_client_.reset(stacking_client);
 }
 
 void Desktop::ShowDesktop() {
   host_->Show();
@@ skipping 13 matching lines @@
 
 void Desktop::SetCursor(gfx::NativeCursor cursor) {
   last_cursor_ = cursor;
   // A lot of code seems to depend on NULL cursors actually showing an arrow,
   // so just pass everything along to the host.
   host_->SetCursor(cursor);
 }
 
 void Desktop::Run() {
   ShowDesktop();
-  MessageLoopForUI::current()->RunWithDispatcher(host_.get());
+  MessageLoopForUI::current()->Run();
 }
 
 void Desktop::Draw() {
   compositor_->Draw(false);
 }
 
 bool Desktop::DispatchMouseEvent(MouseEvent* event) {
   static const int kMouseButtonFlagMask =
       ui::EF_LEFT_BUTTON_DOWN |
       ui::EF_MIDDLE_BUTTON_DOWN |
@@ skipping 217 matching lines @@
   if (!layer()->GetAnimator()->is_animating())
     OnHostResized(host_->GetSize());
 }
 
 #if !defined(NDEBUG)
 void Desktop::ToggleFullScreen() {
   host_->ToggleFullScreen();
 }
 #endif
 
+////////////////////////////////////////////////////////////////////////////////
+// Desktop, private:
+
+Desktop::Desktop()
+    : Window(NULL),
+      host_(aura::DesktopHost::Create(GetInitialHostWindowBounds())),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          stacking_client_(new DefaultStackingClient(this))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)),
+      active_window_(NULL),
+      mouse_button_flags_(0),
+      last_cursor_(kCursorNull),
+      in_destructor_(false),
+      screen_(new ScreenAura),
+      capture_window_(NULL),
+      mouse_pressed_handler_(NULL),
+      mouse_moved_handler_(NULL),
+      focused_window_(NULL),
+      touch_event_handler_(NULL) {
+  set_name("RootWindow");
+  gfx::Screen::SetInstance(screen_);
+  host_->SetDesktop(this);
+  last_mouse_location_ = host_->QueryMouseLocation();
+
+  if (ui::Compositor::compositor_factory()) {
+    compositor_ = (*ui::Compositor::compositor_factory())(this);
+  } else {
+#ifdef USE_WEBKIT_COMPOSITOR
+    ui::CompositorCC::Initialize(false);
+#endif
+    compositor_ = ui::Compositor::Create(this, host_->GetAcceleratedWidget(),
+                                         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())
+    ui::CompositorCC::Terminate();
+#endif
+  if (instance_ == this)
+    instance_ = NULL;
+}
+
 void Desktop::HandleMouseMoved(const MouseEvent& event, Window* target) {
   if (target == mouse_moved_handler_)
     return;
 
   // Send an exited event.
   if (mouse_moved_handler_ && mouse_moved_handler_->delegate()) {
     MouseEvent translated_event(event, this, mouse_moved_handler_,
                                 ui::ET_MOUSE_EXITED, event.flags());
     ProcessMouseEvent(mouse_moved_handler_, &translated_event);
   }
@@ skipping 146 matching lines @@
       base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
     bounds.set_size(gfx::Size(parsed_width, parsed_height));
   } else if (use_fullscreen_host_window_) {
     bounds = gfx::Rect(DesktopHost::GetNativeDisplaySize());
   }
 
   return bounds;
 }
 
 }  // namespace aura