Only show chrome2mobile in action box if it is enabled

chrome/browser/ui/toolbar/action_box_menu_model.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_ACTION_BOX_MENU_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_ACTION_BOX_MENU_MODEL_H_
 
 #include <map>
 
 #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;
 }
 
 // A menu model that builds the contents of the action box menu. This model
 // should be built on demand since its content reflects the state of the browser
 // at creation time.
 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.
   bool IsItemExtension(int index);
 
   // Returns an extension associated with model item at |index|
   // or NULL if it is not an extension item.
   const extensions::Extension* GetExtensionAt(int index);
 
   // Overridden from ui::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
  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;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   Browser* browser_;
-  ExtensionService* extension_service_;
 
   IdToEntensionIdMap id_to_extension_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ActionBoxMenuModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_ACTION_BOX_MENU_MODEL_H_