Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Side by Side Diff: chrome/test/menu_model_test.h

Issue 3163035: Revert "Clean up the WrenchMenuModel so that it uses SimpleMenu::Delegate." (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/wrench_menu_model_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_TEST_MENU_MODEL_TEST_H_ 5 #ifndef CHROME_TEST_MENU_MODEL_TEST_H_
6 #define CHROME_TEST_MENU_MODEL_TEST_H_ 6 #define CHROME_TEST_MENU_MODEL_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "app/menus/accelerator.h"
10 #include "app/menus/simple_menu_model.h" 9 #include "app/menus/simple_menu_model.h"
11 10
12 // A mix-in class to be used in addition to something that derrives from 11 // A mix-in class to be used in addition to something that derrives from
13 // testing::Test to provide some extra functionality for testing menu models. 12 // testing::Test to provide some extra functionality for testing menu models.
14 class MenuModelTest { 13 class MenuModelTest {
15 public: 14 public:
16 MenuModelTest() { } 15 MenuModelTest() { }
17 virtual ~MenuModelTest() { } 16 virtual ~MenuModelTest() { }
18 17
19 protected: 18 protected:
20 // A menu delegate that counts the number of times certain things are called 19 // A menu delegate that counts the number of times certain things are called
21 // to make sure things are hooked up properly. 20 // to make sure things are hooked up properly.
22 class Delegate : public menus::SimpleMenuModel::Delegate, 21 class Delegate : public menus::SimpleMenuModel::Delegate {
23 public menus::AcceleratorProvider {
24 public: 22 public:
25 Delegate() : execute_count_(0), enable_count_(0) { } 23 Delegate() : execute_count_(0), enable_count_(0) { }
26 24
27 virtual bool IsCommandIdChecked(int command_id) const { return false; } 25 virtual bool IsCommandIdChecked(int command_id) const { return false; }
28 virtual bool IsCommandIdEnabled(int command_id) const { 26 virtual bool IsCommandIdEnabled(int command_id) const {
29 ++enable_count_; 27 ++enable_count_;
30 return true; 28 return true;
31 } 29 }
32 virtual bool GetAcceleratorForCommandId( 30 virtual bool GetAcceleratorForCommandId(
33 int command_id, 31 int command_id,
34 menus::Accelerator* accelerator) { return false; } 32 menus::Accelerator* accelerator) { return false; }
35 virtual void ExecuteCommand(int command_id) { ++execute_count_; } 33 virtual void ExecuteCommand(int command_id) { ++execute_count_; }
36 34
37 int execute_count_; 35 int execute_count_;
38 mutable int enable_count_; 36 mutable int enable_count_;
39 }; 37 };
40 38
41 // Recursively checks the enabled state and executes a command on every item 39 // Recursively checks the enabled state and executes a command on every item
42 // that's not a separator or a submenu parent item. The returned count should 40 // that's not a separator or a submenu parent item. The returned count should
43 // match the number of times the delegate is called to ensure every item 41 // match the number of times the delegate is called to ensure every item
44 // works. 42 // works.
45 void CountEnabledExecutable(menus::MenuModel* model, int* count); 43 void CountEnabledExecutable(menus::MenuModel* model, int* count);
46 44
47 Delegate delegate_; 45 Delegate delegate_;
48 }; 46 };
49 47
50 #endif // CHROME_TEST_MENU_MODEL_TEST_H_ 48 #endif // CHROME_TEST_MENU_MODEL_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/wrench_menu_model_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698