Revert 102512 - views: Factor out MenuListener into its own header file.

R=sky@chromium.org

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

TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/8018007

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

17 files changed, 58 insertions, 103 deletions

diff --git a/chrome/browser/automation/testing_automation_provider_views.cc b/chrome/browser/automation/testing_automation_provider_views.cc
index 40af25b..d2d81e5 100644
--- a/chrome/browser/automation/testing_automation_provider_views.cc
+++ b/chrome/browser/automation/testing_automation_provider_views.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/automation/testing_automation_provider.h"
 
-#include "base/compiler_specific.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -12,7 +11,7 @@
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/automation_messages.h"
 #include "ui/gfx/point.h"
-#include "views/controls/menu/menu_listener.h"
+#include "views/controls/menu/menu_wrapper.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
@@ -89,8 +88,8 @@ class TestingAutomationProvider::PopupMenuWaiter : public views::MenuListener {
 
   virtual ~PopupMenuWaiter() {}
 
-  // Overridden from views::MenuListener:
-  virtual void OnMenuOpened() OVERRIDE {
+  // Implementation of views::MenuListener
+  virtual void OnMenuOpened() {
     toolbar_view_->RemoveMenuListener(this);
     automation_->popup_menu_opened_ = true;
     automation_->popup_menu_waiter_ = NULL;
diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h
index a35c05b..b938e21 100644
--- a/chrome/browser/chromeos/frame/browser_view.h
+++ b/chrome/browser/chromeos/frame/browser_view.h
@@ -8,13 +8,12 @@
 
 #include <vector>
 
-#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "views/context_menu_controller.h"
-#include "views/controls/menu/menu_listener.h"
+#include "views/controls/menu/menu_wrapper.h"
 
 class AccessibleToolbarView;
 class Profile;
diff --git a/chrome/browser/ui/views/compact_nav/compact_options_bar.cc b/chrome/browser/ui/views/compact_nav/compact_options_bar.cc
index ee0f065..1e2548b 100644
--- a/chrome/browser/ui/views/compact_nav/compact_options_bar.cc
+++ b/chrome/browser/ui/views/compact_nav/compact_options_bar.cc
@@ -17,15 +17,12 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "views/controls/button/menu_button.h"
-#include "views/controls/menu/menu_listener.h"
 
 namespace {
-
 const int kPreferredHeight = 25;
 // Pad the left and right ends from other tabstrip region items.
 const int kEndPadding = 3;
-
-}  // namespace
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // CompactOptionsBar public:
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index a8300cf..6c6b5e2 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -36,7 +36,6 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "views/controls/button/button_dropdown.h"
-#include "views/controls/menu/menu_listener.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/window/non_client_view.h"
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index ccc1a76..d4532e3 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -20,6 +20,7 @@
 #include "ui/base/models/accelerator.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu.h"
+#include "views/controls/menu/menu_wrapper.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/view.h"
 
@@ -28,10 +29,6 @@ class Browser;
 class Profile;
 class WrenchMenu;
 
-namespace views {
-class MenuListener;
-}
-
 // The Browser Window's toolbar.
 class ToolbarView : public AccessiblePaneView,
                     public views::ViewMenuDelegate,
diff --git a/views/controls/menu/menu_2.cc b/views/controls/menu/menu_2.cc
index accd581..4fa5851 100644
--- a/views/controls/menu/menu_2.cc
+++ b/views/controls/menu/menu_2.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "views/controls/menu/menu_2.h"
 
-#include "ui/base/models/menu_model.h"
-#include "views/controls/menu/menu_listener.h"
+#include "base/compiler_specific.h"
+#include "views/controls/menu/menu_wrapper.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_2.h b/views/controls/menu/menu_2.h
index 4460eea..5a93179 100644
--- a/views/controls/menu/menu_2.h
+++ b/views/controls/menu/menu_2.h
@@ -6,9 +6,8 @@
 #define VIEWS_CONTROLS_MENU_MENU_2_H_
 #pragma once
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/gfx/native_widget_types.h"
+#include "ui/base/models/menu_model.h"
 #include "views/controls/menu/menu_wrapper.h"
 #include "views/views_export.h"
 
@@ -16,13 +15,10 @@ namespace gfx {
 class Point;
 }
 
-namespace ui {
-class MenuModel;
-}
-
 namespace views {
 
 class NativeMenuGtk;
+class View;
 
 // A menu. Populated from a model, and relies on a delegate to execute commands.
 //
@@ -31,13 +27,6 @@ class NativeMenuGtk;
 // ActivatedAt is never invoked.
 class VIEWS_EXPORT Menu2 {
  public:
-  // How the menu is aligned relative to the point it is shown at.
-  // The alignment is reversed by menu if text direction is right to left.
-  enum Alignment {
-    ALIGN_TOPLEFT,
-    ALIGN_TOPRIGHT
-  };
-
   // Creates a new menu populated with the contents of |model|.
   // WARNING: this populates the menu on construction by invoking methods on
   // the model. As such, it is typically not safe to use this as the model
@@ -47,6 +36,13 @@ class VIEWS_EXPORT Menu2 {
   explicit Menu2(ui::MenuModel* model);
   virtual ~Menu2();
 
+  // How the menu is aligned relative to the point it is shown at.
+  // The alignment is reversed by menu if text direction is right to left.
+  enum Alignment {
+    ALIGN_TOPLEFT,
+    ALIGN_TOPRIGHT
+  };
+
   // Runs the menu at the specified point. This method blocks until done.
   // RunContextMenuAt is the same, but the alignment is the default for a
   // context menu.
diff --git a/views/controls/menu/menu_listener.h b/views/controls/menu/menu_listener.h
deleted file mode 100644
index 332eee7..0000000
--- a/views/controls/menu/menu_listener.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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.
-
-#ifndef VIEWS_CONTROLS_MENU_MENU_LISTENER_H_
-#define VIEWS_CONTROLS_MENU_MENU_LISTENER_H_
-#pragma once
-
-#include "views/views_export.h"
-
-namespace views {
-
-// An interface for clients that want a notification when a menu is opened.
-class VIEWS_EXPORT MenuListener {
- public:
-  // This will be called after the menu has actually opened.
-  virtual void OnMenuOpened() = 0;
-
- protected:
-  virtual ~MenuListener() {}
-};
-
-}  // namespace views
-
-#endif  // VIEWS_CONTROLS_MENU_MENU_LISTENER_H_
diff --git a/views/controls/menu/menu_wrapper.h b/views/controls/menu/menu_wrapper.h
index ad171e4..9281e70 100644
--- a/views/controls/menu/menu_wrapper.h
+++ b/views/controls/menu/menu_wrapper.h
@@ -16,7 +16,13 @@ class Point;
 namespace views {
 
 class Menu2;
-class MenuListener;
+
+// An interface for clients that want a notification when a menu is opened.
+class MenuListener {
+ public:
+  // This will be called after the menu has actually opened.
+  virtual void OnMenuOpened() = 0;
+};
 
 // An interface that wraps an object that implements a menu.
 class VIEWS_EXPORT MenuWrapper {
diff --git a/views/controls/menu/native_menu_aura.cc b/views/controls/menu/native_menu_aura.cc
index 602e9d1..d441712 100644
--- a/views/controls/menu/native_menu_aura.cc
+++ b/views/controls/menu/native_menu_aura.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "views/controls/menu/menu_2.h"
-#include "views/controls/menu/menu_listener.h"
 #include "views/controls/menu/menu_wrapper.h"
 
 namespace views {
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index d661d7f..7e60d45 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -20,7 +20,6 @@
 #include "ui/gfx/gtk_util.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
-#include "views/controls/menu/menu_listener.h"
 #include "views/controls/menu/nested_dispatcher_gtk.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget_gtk.h"
diff --git a/views/controls/menu/native_menu_gtk.h b/views/controls/menu/native_menu_gtk.h
index 9d90cb5..de9ff7e 100644
--- a/views/controls/menu/native_menu_gtk.h
+++ b/views/controls/menu/native_menu_gtk.h
@@ -8,8 +8,6 @@
 
 #include <gtk/gtk.h>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "ui/base/gtk/gtk_signal.h"
@@ -39,18 +37,18 @@ class NativeMenuGtk : public MenuWrapper,
   virtual ~NativeMenuGtk();
 
   // Overridden from MenuWrapper:
-  virtual void RunMenuAt(const gfx::Point& point, int alignment) OVERRIDE;
-  virtual void CancelMenu() OVERRIDE;
-  virtual void Rebuild() OVERRIDE;
-  virtual void UpdateStates() OVERRIDE;
-  virtual gfx::NativeMenu GetNativeMenu() const OVERRIDE;
-  virtual MenuAction GetMenuAction() const OVERRIDE;
-  virtual void AddMenuListener(MenuListener* listener) OVERRIDE;
-  virtual void RemoveMenuListener(MenuListener* listener) OVERRIDE;
-  virtual void SetMinimumWidth(int width) OVERRIDE;
+  virtual void RunMenuAt(const gfx::Point& point, int alignment);
+  virtual void CancelMenu();
+  virtual void Rebuild();
+  virtual void UpdateStates();
+  virtual gfx::NativeMenu GetNativeMenu() const;
+  virtual MenuAction GetMenuAction() const;
+  virtual void AddMenuListener(MenuListener* listener);
+  virtual void RemoveMenuListener(MenuListener* listener);
+  virtual void SetMinimumWidth(int width);
 
   // Overriden from MessageLoopForUI::Dispatcher:
-  virtual bool Dispatch(GdkEvent* event) OVERRIDE;
+  virtual bool Dispatch(GdkEvent* event);
 
  private:
   CHROMEGTK_CALLBACK_0(NativeMenuGtk, void, OnMenuHidden);
diff --git a/views/controls/menu/native_menu_linux.cc b/views/controls/menu/native_menu_linux.cc
index f1f2b7b..7556874 100644
--- a/views/controls/menu/native_menu_linux.cc
+++ b/views/controls/menu/native_menu_linux.cc
@@ -9,8 +9,6 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "views/controls/menu/menu_2.h"
-#include "views/controls/menu/menu_item_view.h"
-#include "views/controls/menu/menu_listener.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 
diff --git a/views/controls/menu/native_menu_linux.h b/views/controls/menu/native_menu_linux.h
index 131080d..bfec464 100644
--- a/views/controls/menu/native_menu_linux.h
+++ b/views/controls/menu/native_menu_linux.h
@@ -6,10 +6,8 @@
 #define VIEWS_CONTROLS_MENU_NATIVE_MENU_LINUX_H_
 #pragma once
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "views/controls/menu/menu_delegate.h"
+#include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_wrapper.h"
 
 namespace ui {
@@ -18,7 +16,6 @@ class MenuModel;
 
 namespace views {
 
-class MenuItemView;
 class MenuRunner;
 
 // A non-GTK implementation of MenuWrapper, used currently for touchui.
@@ -29,21 +26,21 @@ class NativeMenuLinux : public MenuWrapper,
   virtual ~NativeMenuLinux();
 
   // Overridden from MenuWrapper:
-  virtual void RunMenuAt(const gfx::Point& point, int alignment) OVERRIDE;
-  virtual void CancelMenu() OVERRIDE;
-  virtual void Rebuild() OVERRIDE;
-  virtual void UpdateStates() OVERRIDE;
-  virtual gfx::NativeMenu GetNativeMenu() const OVERRIDE;
-  virtual MenuAction GetMenuAction() const OVERRIDE;
-  virtual void AddMenuListener(MenuListener* listener) OVERRIDE;
-  virtual void RemoveMenuListener(MenuListener* listener) OVERRIDE;
-  virtual void SetMinimumWidth(int width) OVERRIDE;
+  virtual void RunMenuAt(const gfx::Point& point, int alignment);
+  virtual void CancelMenu();
+  virtual void Rebuild();
+  virtual void UpdateStates();
+  virtual gfx::NativeMenu GetNativeMenu() const;
+  virtual MenuAction GetMenuAction() const;
+  virtual void AddMenuListener(MenuListener* listener);
+  virtual void RemoveMenuListener(MenuListener* listener);
+  virtual void SetMinimumWidth(int width);
 
   // Overridden from MenuDelegate:
-  virtual bool IsItemChecked(int id) const OVERRIDE;
-  virtual bool IsCommandEnabled(int id) const OVERRIDE;
-  virtual void ExecuteCommand(int id) OVERRIDE;
-  virtual bool GetAccelerator(int id, views::Accelerator* accelerator) OVERRIDE;
+  virtual bool IsItemChecked(int id) const;
+  virtual bool IsCommandEnabled(int id) const;
+  virtual void ExecuteCommand(int id);
+  virtual bool GetAccelerator(int id, views::Accelerator* accelerator);
 
  private:
   void AddMenuItemsFromModel(MenuItemView* parent, ui::MenuModel* model);
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index fd82353..55cfefe 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -23,7 +23,6 @@
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/menu_config.h"
-#include "views/controls/menu/menu_listener.h"
 
 using gfx::NativeTheme;
 
diff --git a/views/controls/menu/native_menu_win.h b/views/controls/menu/native_menu_win.h
index 7419196..489cbd3 100644
--- a/views/controls/menu/native_menu_win.h
+++ b/views/controls/menu/native_menu_win.h
@@ -8,8 +8,6 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/base/models/simple_menu_model.h"
@@ -29,15 +27,15 @@ class VIEWS_EXPORT NativeMenuWin : public MenuWrapper {
   virtual ~NativeMenuWin();
 
   // Overridden from MenuWrapper:
-  virtual void RunMenuAt(const gfx::Point& point, int alignment) OVERRIDE;
-  virtual void CancelMenu() OVERRIDE;
-  virtual void Rebuild() OVERRIDE;
-  virtual void UpdateStates() OVERRIDE;
-  virtual gfx::NativeMenu GetNativeMenu() const OVERRIDE;
-  virtual MenuAction GetMenuAction() const OVERRIDE;
-  virtual void AddMenuListener(MenuListener* listener) OVERRIDE;
-  virtual void RemoveMenuListener(MenuListener* listener) OVERRIDE;
-  virtual void SetMinimumWidth(int width) OVERRIDE;
+  virtual void RunMenuAt(const gfx::Point& point, int alignment);
+  virtual void CancelMenu();
+  virtual void Rebuild();
+  virtual void UpdateStates();
+  virtual gfx::NativeMenu GetNativeMenu() const;
+  virtual MenuAction GetMenuAction() const;
+  virtual void AddMenuListener(MenuListener* listener);
+  virtual void RemoveMenuListener(MenuListener* listener);
+  virtual void SetMinimumWidth(int width);
 
  private:
   // IMPORTANT: Note about indices.
diff --git a/views/views.gyp b/views/views.gyp
index 85619a3..65b90fb 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -128,7 +128,6 @@
         'controls/menu/menu_item_view.h',
         'controls/menu/menu_item_view_linux.cc',
         'controls/menu/menu_item_view_win.cc',
-        'controls/menu/menu_listener.h',
         'controls/menu/menu_model_adapter.cc',
         'controls/menu/menu_model_adapter.h',
         'controls/menu/menu_runner.cc',