summaryrefslogtreecommitdiffstats
path: root/chrome/test/menu_model_test.h
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 21:01:34 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 21:01:34 +0000
commitfa9ed6a0cd30041c269398e99f3f34ef070d8666 (patch)
tree803e593f722de0fe0589f605008e2b83b9651c25 /chrome/test/menu_model_test.h
parentdf970ecba180164e86be3dc3a3b802e203295984 (diff)
downloadchromium_src-fa9ed6a0cd30041c269398e99f3f34ef070d8666.zip
chromium_src-fa9ed6a0cd30041c269398e99f3f34ef070d8666.tar.gz
chromium_src-fa9ed6a0cd30041c269398e99f3f34ef070d8666.tar.bz2
Reapply menu model cleanups, with WrenchMenuModel being a SimpleMenuModel.
BUG=47320 TEST=compiles Review URL: http://codereview.chromium.org/3184021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/menu_model_test.h')
-rw-r--r--chrome/test/menu_model_test.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/menu_model_test.h b/chrome/test/menu_model_test.h
index a87993b4..92c390c 100644
--- a/chrome/test/menu_model_test.h
+++ b/chrome/test/menu_model_test.h
@@ -6,6 +6,7 @@
#define CHROME_TEST_MENU_MODEL_TEST_H_
#pragma once
+#include "app/menus/accelerator.h"
#include "app/menus/simple_menu_model.h"
// A mix-in class to be used in addition to something that derrives from
@@ -18,7 +19,8 @@ class MenuModelTest {
protected:
// A menu delegate that counts the number of times certain things are called
// to make sure things are hooked up properly.
- class Delegate : public menus::SimpleMenuModel::Delegate {
+ class Delegate : public menus::SimpleMenuModel::Delegate,
+ public menus::AcceleratorProvider {
public:
Delegate() : execute_count_(0), enable_count_(0) { }