Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
diff --git a/base/message_pump_glib_x.h b/base/message_pump_glib_x.h
index fc3f3b1..e94b797 100644
--- a/base/message_pump_glib_x.h
+++ b/base/message_pump_glib_x.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -22,9 +22,6 @@
MessagePumpGlibX();
virtual ~MessagePumpGlibX();
- // MessagePumpForUI implementation.
- virtual bool RunOnce(GMainContext* context, bool block);
-
// Indicates whether a GDK event was injected by chrome (when |true|) or if it
// was captured and being processed by GDK (when |false|).
bool IsDispatchingEvent(void) { return dispatching_event_; }
@@ -34,6 +31,9 @@
void SetupXInput2ForXWindow(Window xid);
#endif
+ // Overridden from MessagePumpForUI:
+ virtual bool RunOnce(GMainContext* context, bool block);
+
private:
static void EventDispatcherX(GdkEvent* event, gpointer data);