diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 18:45:25 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 18:45:25 +0000 |
| commit | b1179c5f44032e5fa9947d85cd85c78d105d3e43 (patch) | |
| tree | 86df9c7c692b88b8c412dd598822aa7b7835d1ff /chrome/browser/automation/testing_automation_provider_views.cc | |
| parent | bc1c287d91e234b40856411be23dcb4c40dcc849 (diff) | |
| download | chromium_src-b1179c5f44032e5fa9947d85cd85c78d105d3e43.zip chromium_src-b1179c5f44032e5fa9947d85cd85c78d105d3e43.tar.gz chromium_src-b1179c5f44032e5fa9947d85cd85c78d105d3e43.tar.bz2 | |
Reland "views: Factor out MenuListener into its own header file."
This should fix linux_touch build including the missing header file for MenuModel.
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/8008023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102538 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, 4 insertions, 3 deletions
diff --git a/chrome/browser/automation/testing_automation_provider_views.cc b/chrome/browser/automation/testing_automation_provider_views.cc index d2d81e5..40af25b 100644 --- a/chrome/browser/automation/testing_automation_provider_views.cc +++ b/chrome/browser/automation/testing_automation_provider_views.cc @@ -4,6 +4,7 @@ #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" @@ -11,7 +12,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_wrapper.h" +#include "views/controls/menu/menu_listener.h" #include "views/view.h" #include "views/widget/widget.h" @@ -88,8 +89,8 @@ class TestingAutomationProvider::PopupMenuWaiter : public views::MenuListener { virtual ~PopupMenuWaiter() {} - // Implementation of views::MenuListener - virtual void OnMenuOpened() { + // Overridden from views::MenuListener: + virtual void OnMenuOpened() OVERRIDE { toolbar_view_->RemoveMenuListener(this); automation_->popup_menu_opened_ = true; automation_->popup_menu_waiter_ = NULL; |