Revert r37025, which (may have) caused workertest redness

Views: use ExtensionToolbarModel for ordering of browser action buttons. This doesn't implement drag and drop reording, but the order is stored on shutdown and restored on startup. BUG=26990 Review URL: http://codereview.chromium.org/554057

TBR=amanda

Review URL: http://codereview.chromium.org/546133

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

1 files changed, 8 insertions, 9 deletions

diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h
index 8cf1815..d2b87a4 100644
--- a/chrome/browser/views/browser_actions_container.h
+++ b/chrome/browser/views/browser_actions_container.h
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "base/task.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/views/browser_bubble.h"
 #include "chrome/browser/views/extensions/extension_action_context_menu.h"
@@ -216,8 +215,7 @@ class BrowserActionsContainer
     public BrowserBubble::Delegate,
     public views::ViewMenuDelegate,
     public views::ResizeGripper::ResizeGripperDelegate,
-    public AnimationDelegate,
-    public ExtensionToolbarModel::Observer {
+    public AnimationDelegate {
  public:
   BrowserActionsContainer(Profile* profile, ToolbarView* toolbar);
   virtual ~BrowserActionsContainer();
@@ -297,9 +295,13 @@ class BrowserActionsContainer
   ExtensionPopup* TestGetPopup() { return popup_; }
 
  private:
-  // ExtensionToolbarModel::Observer implementation.
-  virtual void BrowserActionAdded(Extension* extension, int index);
-  virtual void BrowserActionRemoved(Extension* extension);
+  // Adds a browser action view for the extension if it needs one. DCHECK if
+  // it has already been added.
+  void AddBrowserAction(Extension* extension);
+
+  // Removes the browser action view for an extension if it has one. DCHECK if
+  // no such view.
+  void RemoveBrowserAction(Extension* extension);
 
   // Takes a width in pixels, calculates how many icons fit within that space
   // (up to the maximum number of icons in our vector) and shaves off the
@@ -336,9 +338,6 @@ class BrowserActionsContainer
   // from browser_action_views_).
   BrowserActionButton* popup_button_;
 
-  // The model that tracks the order of the toolbar icons.
-  ExtensionToolbarModel* model_;
-
   // The current size of the container.
   gfx::Size container_size_;