views: Make use of ObserverList API to add/remove MenuListeners from NativeMenu.

R=sky@chromium.org

Review URL: http://codereview.chromium.org/7888032

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

1 files changed, 3 insertions, 12 deletions

diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index 8a20381..55cfefe 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -496,18 +496,11 @@ NativeMenuWin::MenuAction NativeMenuWin::GetMenuAction() const {
 }
 
 void NativeMenuWin::AddMenuListener(MenuListener* listener) {
-  listeners_.push_back(listener);
+  listeners_.AddObserver(listener);
 }
 
 void NativeMenuWin::RemoveMenuListener(MenuListener* listener) {
-  for (std::vector<MenuListener*>::iterator iter = listeners_.begin();
-    iter != listeners_.end();
-    ++iter) {
-      if (*iter == listener) {
-        listeners_.erase(iter);
-        return;
-      }
-  }
+  listeners_.RemoveObserver(listener);
 }
 
 void NativeMenuWin::SetMinimumWidth(int width) {
@@ -560,9 +553,7 @@ LRESULT CALLBACK NativeMenuWin::MenuMessageHook(
   // The first time this hook is called, that means the menu has successfully
   // opened, so call the callback function on all of our listeners.
   if (!this_ptr->listeners_called_) {
-    for (unsigned int i = 0; i < this_ptr->listeners_.size(); ++i) {
-      this_ptr->listeners_[i]->OnMenuOpened();
-    }
+    FOR_EACH_OBSERVER(MenuListener, this_ptr->listeners_, OnMenuOpened());
     this_ptr->listeners_called_ = true;
   }