commit a06ba839085c82d7f312231e1704525fdae11db9
author sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Sep 07 10:13:39 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 15:12:20 2020 +0900
tree a60ac2a439f148bd2337cdb9c5a07f1b8dba91a5
parent b8b1be409b3f6276927846dc0673cac7eb128c04

gtk: Some code cleanup for the message-pump.

GTK message-pump defines its own observer, but it has the same name as the
message-pump observers used in other platforms. So rename the GTK version
to MessagePumpGdkObserver.

Also, GTK version of message-pump dispatcher is never used, so get rid of
that.

BUG=145600
R=piman@chromium.org, thakis@chromium.org

Review URL: https://codereview.chromium.org/23537016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221846 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: 827d38ae4b2bbd630b8950edbb52a83c5329593f

base/message_loop/message_loop.cc

diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc
index cf0b31c..cdd8721 100644
--- a/base/message_loop/message_loop.cc
+++ b/base/message_loop/message_loop.cc
@@ -425,7 +425,8 @@
 
   StartHistogrammer();
 
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
+    !defined(USE_GTK_MESSAGE_PUMP)
   if (run_loop_->dispatcher_ && type() == TYPE_UI) {
     static_cast<MessagePumpForUI*>(pump_.get())->
         RunWithDispatcher(this, run_loop_->dispatcher_);