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..69aaa5558b614d85ca203976409ddc5e2ed2d6a3 100644
--- a/chrome/browser/ui/toolbar/action_box_menu_model.h
+++ b/chrome/browser/ui/toolbar/action_box_menu_model.h
@@ -9,10 +9,14 @@
 
 #include "content/public/browser/notification_observer.h"
 #include "chrome/browser/extensions/extension_service.h"

[msw, 2012/08/30 00:41:43]

Remove these two extension includes with the out-of-line definition below.

[Cait (Slow), 2012/08/30 01:33:29]

Done.

+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/ui/browser.h"

[msw, 2012/08/30 00:41:43]

The Browser forward decl will suffice with the out-of-line definition below.

[Cait (Slow), 2012/08/30 01:33:29]

Done.

+#include "chrome/browser/ui/browser_command_controller.h"

[msw, 2012/08/30 00:41:43]

browser_command_controller.h and browser_commands.h seem unnecessary.

[Cait (Slow), 2012/08/30 01:33:29]

browser_commands.h is needed, browser_command_controller.h isn't.

 #include "chrome/browser/ui/browser_commands.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class Browser;
+class Profile;

[msw, 2012/08/30 00:41:43]

Remove this forward decl with the out-of-line definition below.

[Cait (Slow), 2012/08/30 01:33:29]

Done.

 
 namespace extensions {
 class Extension;
@@ -25,8 +29,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.
@@ -46,7 +49,10 @@ class ActionBoxMenuModel : public ui::SimpleMenuModel,
 
  private:
   const extensions::ExtensionList& action_box_menu_items() {

[msw, 2012/08/30 00:41:43]

This shouldn't be defined inline anymore (also needs to be renamed with
CamelCase as [Get]ActionBoxMenuItems or similar).

[Cait (Slow), 2012/08/30 01:33:29]

Done.

-    return extension_service_->toolbar_model()->action_box_menu_items();
+    ExtensionService* extension_service =
+        extensions::ExtensionSystem::Get(browser_->profile())->
+            extension_service();
+    return extension_service->toolbar_model()->action_box_menu_items();
   }
 
   typedef std::map<int, std::string> IdToEntensionIdMap;
@@ -57,7 +63,6 @@ class ActionBoxMenuModel : public ui::SimpleMenuModel,
                        const content::NotificationDetails& details) OVERRIDE;
 
   Browser* browser_;
-  ExtensionService* extension_service_;
 
   IdToEntensionIdMap id_to_extension_id_map_;