Merge 175452

base/message_pump_aurax11.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_aurax11.h"
 
 #include <glib.h>
 #include <X11/X.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/XKBlib.h>
@@ skipping 151 matching lines @@
     unsigned long xid) {
   dispatchers_.insert(std::make_pair(xid, dispatcher));
 }
 
 void MessagePumpAuraX11::RemoveDispatcherForWindow(unsigned long xid) {
   dispatchers_.erase(xid);
 }
 
 void MessagePumpAuraX11::AddDispatcherForRootWindow(
     MessagePumpDispatcher* dispatcher) {
-  DCHECK(std::find(root_window_dispatchers_.begin(),
-                   root_window_dispatchers_.end(),
-                   dispatcher) ==
-         root_window_dispatchers_.end());
-  root_window_dispatchers_.push_back(dispatcher);
+  root_window_dispatchers_.AddObserver(dispatcher);
 }
 
 void MessagePumpAuraX11::RemoveDispatcherForRootWindow(
     MessagePumpDispatcher* dispatcher) {
-  root_window_dispatchers_.erase(
-      std::remove(root_window_dispatchers_.begin(),
-                  root_window_dispatchers_.end(),
-                  dispatcher));
+  root_window_dispatchers_.RemoveObserver(dispatcher);
 }
 
 bool MessagePumpAuraX11::DispatchXEvents() {
   Display* display = GetDefaultXDisplay();
   DCHECK(display);
   MessagePumpDispatcher* dispatcher =
       GetDispatcher() ? GetDispatcher() : this;
 
   // 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.
@@ skipping 101 matching lines @@
   // dispatchers.
   if (xev->type == MappingNotify) {
     for (DispatchersMap::const_iterator it = dispatchers_.begin();
          it != dispatchers_.end(); ++it) {
       it->second->Dispatch(xev);
     }
     return true;
   }
 
   if (FindEventTarget(xev) == x_root_window_) {
-    for (Dispatchers::const_iterator it = root_window_dispatchers_.begin();
-         it != root_window_dispatchers_.end();
-         ++it) {
-      (*it)->Dispatch(xev);
-    }
+    FOR_EACH_OBSERVER(MessagePumpDispatcher, root_window_dispatchers_,
+                      Dispatch(xev));
     return true;
   }
   MessagePumpDispatcher* dispatcher = GetDispatcherForXEvent(xev);
   return dispatcher ? dispatcher->Dispatch(xev) : true;
 }
 
 }  // namespace base