RefCounted types should not have public destructors, Linux fixes

base/message_pump_x.cc

 // Copyright (c) 2012 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 "base/message_pump_x.h"
 
 #include <X11/extensions/XInput2.h>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
@@ skipping 75 matching lines @@
 }  // namespace
 
 namespace base {
 
 MessagePumpX::MessagePumpX() : MessagePumpGlib(),
     x_source_(NULL) {
   InitializeXInput2();
   InitXSource();
 }
 
-MessagePumpX::~MessagePumpX() {
-  g_source_destroy(x_source_);
-  g_source_unref(x_source_);
-  XCloseDisplay(g_xdisplay);
-  g_xdisplay = NULL;
-}
-
 // static
 Display* MessagePumpX::GetDefaultXDisplay() {
   if (!g_xdisplay)
     g_xdisplay = XOpenDisplay(NULL);
   return g_xdisplay;
 }
 
 // static
 bool MessagePumpX::HasXInput2() {
   return InitializeXInput2();
 }
 
 // static
 void MessagePumpX::SetDefaultDispatcher(MessagePumpDispatcher* dispatcher) {
   DCHECK(!g_default_dispatcher || !dispatcher);
   g_default_dispatcher = dispatcher;
 }
 
+gboolean MessagePumpX::DispatchXEvents() {
+  Display* display = GetDefaultXDisplay();
+  DCHECK(display);
+  MessagePumpDispatcher* dispatcher =
+      GetDispatcher() ? GetDispatcher() : g_default_dispatcher;
+
+  // In the general case, we want to handle all pending events before running
+  // the tasks. This is what happens in the message_pump_glib case.
+  while (XPending(display)) {
+    XEvent xev;
+    XNextEvent(display, &xev);
+    if (dispatcher && ProcessXEvent(dispatcher, &xev))
+      return TRUE;
+  }
+  return TRUE;
+}
+
+MessagePumpX::~MessagePumpX() {
+  g_source_destroy(x_source_);
+  g_source_unref(x_source_);
+  XCloseDisplay(g_xdisplay);
+  g_xdisplay = NULL;
+}
+
 void MessagePumpX::InitXSource() {
   // CHECKs are to help track down crbug.com/113106.
   CHECK(!x_source_);
   Display* display = GetDefaultXDisplay();
   CHECK(display) << "Unable to get connection to X server";
   x_poll_.reset(new GPollFD());
   CHECK(x_poll_.get());
   x_poll_->fd = ConnectionNumber(display);
   x_poll_->events = G_IO_IN;
 
@@ skipping 22 matching lines @@
     DidProcessXEvent(xev);
   }
 
   if (have_cookie) {
     XFreeEventData(xev->xgeneric.display, &xev->xcookie);
   }
 
   return should_quit;
 }
 
-gboolean MessagePumpX::DispatchXEvents() {
-  Display* display = GetDefaultXDisplay();
-  DCHECK(display);
-  MessagePumpDispatcher* dispatcher =
-      GetDispatcher() ? GetDispatcher() : g_default_dispatcher;
-
-  // In the general case, we want to handle all pending events before running
-  // the tasks. This is what happens in the message_pump_glib case.
-  while (XPending(display)) {
-    XEvent xev;
-    XNextEvent(display, &xev);
-    if (dispatcher && ProcessXEvent(dispatcher, &xev))
-      return TRUE;
-  }
-  return TRUE;
-}
-
 bool MessagePumpX::WillProcessXEvent(XEvent* xevent) {
   if (!observers().might_have_observers())
     return false;
   ObserverListBase<MessagePumpObserver>::Iterator it(observers());
   MessagePumpObserver* obs;
   while ((obs = it.GetNext()) != NULL) {
     if (obs->WillProcessEvent(xevent))
       return true;
   }
   return false;
 }
 
 void MessagePumpX::DidProcessXEvent(XEvent* xevent) {
   FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(xevent));
 }
 
 }  // namespace base