Index: chrome/browser/ui/toolbar/wrench_menu_model.cc |
=================================================================== |
--- chrome/browser/ui/toolbar/wrench_menu_model.cc (revision 144460) |
+++ chrome/browser/ui/toolbar/wrench_menu_model.cc (working copy) |
@@ -119,12 +119,12 @@ |
} |
bool EncodingMenuModel::IsCommandIdEnabled(int command_id) const { |
- bool enabled = browser_->command_updater()->IsCommandEnabled(command_id); |
+ bool enabled = chrome::IsCommandEnabled(browser_, command_id); |
// Special handling for the contents of the Encoding submenu. On Mac OS, |
// instead of enabling/disabling the top-level menu item, the submenu's |
// contents get disabled, per Apple's HIG. |
#if defined(OS_MACOSX) |
- enabled &= browser_->command_updater()->IsCommandEnabled(IDC_ENCODING_MENU); |
+ enabled &= chrome::IsCommandEnabled(browser_, IDC_ENCODING_MENU); |
#endif |
return enabled; |
} |
@@ -136,7 +136,7 @@ |
} |
void EncodingMenuModel::ExecuteCommand(int command_id) { |
- browser_->ExecuteCommand(command_id); |
+ chrome::ExecuteCommand(browser_, command_id); |
} |
//////////////////////////////////////////////////////////////////////////////// |
@@ -342,7 +342,7 @@ |
if (command_id == IDC_HELP_PAGE_VIA_MENU) |
content::RecordAction(UserMetricsAction("ShowHelpTabViaWrenchMenu")); |
- browser_->ExecuteCommand(command_id); |
+ chrome::ExecuteCommand(browser_, command_id); |
} |
bool WrenchMenuModel::IsCommandIdChecked(int command_id) const { |
@@ -361,7 +361,7 @@ |
if (error) |
return true; |
- return browser_->command_updater()->IsCommandEnabled(command_id); |
+ return chrome::IsCommandEnabled(browser_, command_id); |
} |
bool WrenchMenuModel::IsCommandIdVisible(int command_id) const { |