| Index: chrome/browser/ui/toolbar/action_box_menu_model.h
|
| diff --git a/chrome/browser/ui/toolbar/action_box_menu_model.h b/chrome/browser/ui/toolbar/action_box_menu_model.h
|
| index 132c9106ffcc79c94cf7f0f7a112824fd9e8e30d..e07f84f415b605edbbe774384d55f0402f0c509d 100644
|
| --- a/chrome/browser/ui/toolbar/action_box_menu_model.h
|
| +++ b/chrome/browser/ui/toolbar/action_box_menu_model.h
|
| @@ -37,13 +37,6 @@ class ActionBoxMenuModel : public ui::SimpleMenuModel,
|
| // or NULL if it is not an extension item.
|
| const extensions::Extension* GetExtensionAt(int index);
|
|
|
| - private:
|
| - const extensions::ExtensionList& action_box_menu_items() {
|
| - return extension_service_->toolbar_model()->action_box_menu_items();
|
| - }
|
| -
|
| - typedef std::map<int, std::string> IdToEntensionIdMap;
|
| -
|
| // Overridden from ui::SimpleMenuModel::Delegate:
|
| virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
|
| virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
|
| @@ -52,6 +45,13 @@ class ActionBoxMenuModel : public ui::SimpleMenuModel,
|
| ui::Accelerator* accelerator) OVERRIDE;
|
| virtual void ExecuteCommand(int command_id) OVERRIDE;
|
|
|
| + private:
|
| + const extensions::ExtensionList& action_box_menu_items() {
|
| + return extension_service_->toolbar_model()->action_box_menu_items();
|
| + }
|
| +
|
| + typedef std::map<int, std::string> IdToEntensionIdMap;
|
| +
|
| // Overridden from content::NotificationObserver:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
|
|