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

Unified Diff: chrome/browser/ui/cocoa/menu_controller_unittest.mm

Issue 12279015: Mac Chromium style checker cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm
index 035f92b1f322c31a6867ae7f6b8bb09d1eeeff11..efca488abc8aa305e817ea07eb4405807423ab51 100644
--- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm
@@ -33,17 +33,19 @@ class Delegate : public ui::SimpleMenuModel::Delegate {
did_close_(false) {
}
- virtual bool IsCommandIdChecked(int command_id) const { return false; }
- virtual bool IsCommandIdEnabled(int command_id) const {
+ virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
+ return false;
+ }
+ virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
++enable_count_;
return true;
}
virtual bool GetAcceleratorForCommandId(
int command_id,
- ui::Accelerator* accelerator) { return false; }
- virtual void ExecuteCommand(int command_id) { ++execute_count_; }
+ ui::Accelerator* accelerator) OVERRIDE { return false; }
+ virtual void ExecuteCommand(int command_id) OVERRIDE { ++execute_count_; }
- virtual void MenuWillShow(ui::SimpleMenuModel* /*source*/) {
+ virtual void MenuWillShow(ui::SimpleMenuModel* /*source*/) OVERRIDE {
EXPECT_FALSE(did_show_);
EXPECT_FALSE(did_close_);
did_show_ = true;
@@ -56,7 +58,7 @@ class Delegate : public ui::SimpleMenuModel::Delegate {
inModes:modes];
}
- virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) {
+ virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) OVERRIDE {
EXPECT_TRUE(did_show_);
EXPECT_FALSE(did_close_);
did_close_ = true;
@@ -76,9 +78,15 @@ class Delegate : public ui::SimpleMenuModel::Delegate {
class DynamicDelegate : public Delegate {
public:
DynamicDelegate() {}
- virtual bool IsItemForCommandIdDynamic(int command_id) const { return true; }
- virtual string16 GetLabelForCommandId(int command_id) const { return label_; }
- virtual bool GetIconForCommandId(int command_id, gfx::Image* icon) const {
+ virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE {
+ return true;
+ }
+ virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE {
+ return label_;
+ }
+ virtual bool GetIconForCommandId(
+ int command_id,
+ gfx::Image* icon) const OVERRIDE {
if (icon_.IsEmpty()) {
return false;
} else {

Powered by Google App Engine
This is Rietveld 408576698