Only show chrome2mobile in action box if it is enabled

chrome/browser/ui/toolbar/action_box_menu_model.h

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 8096e8701fb66b2ea7dca1a3444baece31f9524a..a5f3c439fd0efa2b44031e89be586fb4535c3b8c 100644
--- a/chrome/browser/ui/toolbar/action_box_menu_model.h
+++ b/chrome/browser/ui/toolbar/action_box_menu_model.h
@@ -7,9 +7,8 @@
 
 #include <map>
 
-#include "content/public/browser/notification_observer.h"
 #include "chrome/browser/extensions/extension_service.h"

[msw, 2012/08/30 01:47:01]

nit: use chrome/common/extensions/extension.h instead (needed for const
extensions::ExtensionList&) and you can remove the Extension forward decl below.

[Cait (Slow), 2012/08/30 21:46:03]

Done.

-#include "chrome/browser/ui/browser_commands.h"
+#include "content/public/browser/notification_observer.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class Browser;
@@ -25,8 +24,7 @@ class ActionBoxMenuModel : public ui::SimpleMenuModel,
                            public ui::SimpleMenuModel::Delegate,
                            public content::NotificationObserver {
  public:
-  ActionBoxMenuModel(Browser* browser,
-                     ExtensionService* extension_service);
+  explicit ActionBoxMenuModel(Browser* browser);
   virtual ~ActionBoxMenuModel();
 
   // Returns true if item associated with an extension.
@@ -45,9 +43,7 @@ class ActionBoxMenuModel : public ui::SimpleMenuModel,
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
  private:
-  const extensions::ExtensionList& action_box_menu_items() {
-    return extension_service_->toolbar_model()->action_box_menu_items();
-  }
+  const extensions::ExtensionList& GetActionBoxMenuItems();
 
   typedef std::map<int, std::string> IdToEntensionIdMap;
 
@@ -57,7 +53,6 @@ class ActionBoxMenuModel : public ui::SimpleMenuModel,
                        const content::NotificationDetails& details) OVERRIDE;
 
   Browser* browser_;
-  ExtensionService* extension_service_;
 
   IdToEntensionIdMap id_to_extension_id_map_;