re-try r37061 with fix for browser tests...

chrome/browser/views/browser_actions_container.h

 // Copyright (c) 2010 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_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #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"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/controls/resize_gripper.h"
 #include "views/view.h"
 
@@ skipping 189 matching lines @@
 // animation ends and we don't want the chevron to flash into view while we are
 // growing the container.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class BrowserActionsContainer
   : public views::View,
     public NotificationObserver,
     public BrowserBubble::Delegate,
     public views::ViewMenuDelegate,
     public views::ResizeGripper::ResizeGripperDelegate,
-    public AnimationDelegate {
+    public AnimationDelegate,
+    public ExtensionToolbarModel::Observer {
  public:
   BrowserActionsContainer(Profile* profile, ToolbarView* toolbar);
   virtual ~BrowserActionsContainer();
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Get the number of browser actions being displayed.
   int num_browser_actions() const { return browser_action_views_.size(); }
 
   // Whether we are performing resize animation on the container.
@@ skipping 59 matching lines @@
   void HidePopup();
 
   // Simulate a click on a browser action button.  This should only be
   // used by unit tests.
   void TestExecuteBrowserAction(int index);
 
   // Retrieve the current popup.  This should only be used by unit tests.
   ExtensionPopup* TestGetPopup() { return popup_; }
 
  private:
-  // 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);
+  // ExtensionToolbarModel::Observer implementation.
+  virtual void BrowserActionAdded(Extension* extension, int index);
+  virtual void BrowserActionRemoved(Extension* extension);
 
   // Closes the overflow menu if open.
   void CloseOverflowMenu();
 
   // 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
   // excess pixels.
   int ClampToNearestIconCount(int pixels) const;
 
   // Calculates the width of the container area NOT used to show the icons (the
@@ skipping 22 matching lines @@
   // The toolbar that owns us.
   ToolbarView* toolbar_;
 
   // The current popup and the button it came from.  NULL if no popup.
   ExtensionPopup* popup_;
 
   // The button that triggered the current popup (just a reference to a button
   // 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_;
 
   // The resize gripper for the container.
   views::ResizeGripper* resize_gripper_;
 
   // The chevron for accessing the overflow items.
   views::MenuButton* chevron_;
 
   // The menu to show for the overflow button (chevron).
@@ skipping 13 matching lines @@
   // Keeps track of the absolute pixel width the container should have when we
   // are done animating.
   int animation_target_size_;
 
   ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_