diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 17:13:25 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 17:13:25 +0000 |
| commit | 98aa9e2067282f7dd30e63502806b22518e0817b (patch) | |
| tree | bc2f8a870415dce71c7a491833d6e7ad15671bf2 /chrome/browser/automation/testing_automation_provider_views.cc | |
| parent | d928570ffba669f58d7c0b7a6d2707c6b702be31 (diff) | |
| download | chromium_src-98aa9e2067282f7dd30e63502806b22518e0817b.zip chromium_src-98aa9e2067282f7dd30e63502806b22518e0817b.tar.gz chromium_src-98aa9e2067282f7dd30e63502806b22518e0817b.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/automation/testing_automation_provider_views.cc')
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider_views.cc | 7 |
1 files changed, 3 insertions, 4 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; |