Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1140)

Unified Diff: chrome/browser/ui/toolbar/action_box_menu_model.h

Issue 10887029: Only show chrome2mobile in action box if it is enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..4f4a9cca7f9b2844a1027f2ecd6709fdbec863cc 100644
--- a/chrome/browser/ui/toolbar/action_box_menu_model.h
+++ b/chrome/browser/ui/toolbar/action_box_menu_model.h
@@ -7,17 +7,12 @@
#include <map>
+#include "chrome/common/extensions/extension.h"
#include "content/public/browser/notification_observer.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/ui/browser_commands.h"
#include "ui/base/models/simple_menu_model.h"
class Browser;
-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.
@@ -25,8 +20,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 +39,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 +49,6 @@ class ActionBoxMenuModel : public ui::SimpleMenuModel,
const content::NotificationDetails& details) OVERRIDE;
Browser* browser_;
- ExtensionService* extension_service_;
IdToEntensionIdMap id_to_extension_id_map_;

Powered by Google App Engine
This is Rietveld 408576698