diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/cocoa/wrench_menu_controller.mm | 6 | ||||
| -rw-r--r-- | chrome/browser/wrench_menu_model.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/wrench_menu_model.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/wrench_menu_controller.mm b/chrome/browser/cocoa/wrench_menu_controller.mm index ce17447..4f4c894 100644 --- a/chrome/browser/cocoa/wrench_menu_controller.mm +++ b/chrome/browser/cocoa/wrench_menu_controller.mm @@ -74,6 +74,12 @@ NSString* title = base::SysUTF16ToNSString( [self wrenchMenuModel]->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY)); [[zoomItem_ viewWithTag:IDC_ZOOM_PERCENT_DISPLAY] setTitle:title]; + bool plusEnabled = [self wrenchMenuModel]->IsCommandIdEnabled(IDC_ZOOM_PLUS); + bool minusEnabled = [self wrenchMenuModel]->IsCommandIdEnabled( + IDC_ZOOM_MINUS); + + [zoomPlus_ setEnabled:plusEnabled]; + [zoomMinus_ setEnabled:minusEnabled]; NSImage* icon = [self wrenchMenuModel]->browser()->window()->IsFullscreen() ? [NSImage imageNamed:NSImageNameExitFullScreenTemplate] : diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc index c48b973..27d8e09 100644 --- a/chrome/browser/wrench_menu_model.cc +++ b/chrome/browser/wrench_menu_model.cc @@ -396,3 +396,9 @@ bool WrenchMenuModel::IsDynamicItem(int index) const { return command_id == IDC_SYNC_BOOKMARKS || command_id == IDC_ABOUT; } + +bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const { + if (delegate_) + return delegate_->IsCommandIdEnabled(command_id); + return true; +} diff --git a/chrome/browser/wrench_menu_model.h b/chrome/browser/wrench_menu_model.h index 7507507..f8eece1 100644 --- a/chrome/browser/wrench_menu_model.h +++ b/chrome/browser/wrench_menu_model.h @@ -94,6 +94,7 @@ class WrenchMenuModel : public menus::SimpleMenuModel, virtual bool IsLabelForCommandIdDynamic(int command_id) const; virtual string16 GetLabelForCommandId(int command_id) const; virtual void ExecuteCommand(int command_id); + virtual bool IsCommandIdEnabled(int command_id) const; // Overridden from TabStripModelObserver: virtual void TabSelectedAt(TabContents* old_contents, |
