Reland r29095 (removes wrench integration for

browser actions).

Test failure was a fluke. I forgot that changing
resources always makes the first bot run fail.

TBR=mpcomplete@chromium.org
BUG=24379,24671

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29098 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 12 deletions

diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index dee9eed..2d3291e 100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -2,13 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/extensions/extension_action.h"
 
-int ExtensionAction::next_command_id_ = IDC_BROWSER_ACTION_FIRST;
-
 ExtensionAction::ExtensionAction()
-  : type_(PAGE_ACTION), command_id_(next_command_id_++) {
+  : type_(PAGE_ACTION) {
 }
 
 ExtensionAction::~ExtensionAction() {
diff --git a/chrome/common/extensions/extension_action.h b/chrome/common/extensions/extension_action.h
index 046ab63..1577224 100644
--- a/chrome/common/extensions/extension_action.h
+++ b/chrome/common/extensions/extension_action.h
@@ -25,8 +25,6 @@ class ExtensionAction {
     BROWSER_ACTION = 1,
   } ExtensionActionType;
 
-  int command_id() const { return command_id_; }
-
   std::string id() const { return id_; }
   void set_id(const std::string& id) { id_ = id; }
 
@@ -55,8 +53,6 @@ class ExtensionAction {
   bool is_popup() const { return !popup_url_.is_empty(); }
 
  private:
-  static int next_command_id_;
-
   // The id for the ExtensionAction, for example: "RssPageAction".
   // For BrowserActions this is blank.
   std::string id_;
@@ -74,10 +70,6 @@ class ExtensionAction {
   // The paths to the icons that this PageIcon can show.
   std::vector<std::string> icon_paths_;
 
-  // An integer for use with the browser's command system. These should always
-  // be in the range [IDC_BROWSER_ACTION_FIRST, IDC_BROWSER_ACTION_LAST].
-  int command_id_;
-
   // If the action has a popup, it has a URL and a height.
   GURL popup_url_;
   int popup_height_;