[Mac] Use the ExtensionToolbarModel for ordering of the Browser Actions. Prep for drag and drop for re-ordering.

Also fixes crashers where if you tried to disable an extension via its context menu while an incognito window was key, boom.

BUG=26990
TEST=none
Review URL: http://codereview.chromium.org/595017

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

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/cocoa/extensions/browser_actions_controller.h b/chrome/browser/cocoa/extensions/browser_actions_controller.h
index 3be6814..c15138b 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_controller.h
+++ b/chrome/browser/cocoa/extensions/browser_actions_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -15,6 +15,7 @@ class Browser;
 @class BrowserActionsContainerView;
 class Extension;
 @class ExtensionPopupController;
+class ExtensionToolbarModel;
 class ExtensionsServiceObserverBridge;
 class Profile;
 
@@ -33,6 +34,9 @@ extern NSString* const kBrowserActionsChangedNotification;
   // The current profile. Weak.
   Profile* profile_;
 
+  // The model that tracks the order of the toolbar icons. Weak.
+  ExtensionToolbarModel* toolbarModel_;
+
   // The observer for the ExtensionsService we're getting events from.
   scoped_ptr<ExtensionsServiceObserverBridge> observer_;
 
@@ -57,10 +61,6 @@ extern NSString* const kBrowserActionsChangedNotification;
 // Update the display of all buttons.
 - (void)update;
 
-// Marks the container view for redraw. Called by the extension service
-// notification bridge.
-- (void)browserActionVisibilityHasChanged;
-
 // Returns the current number of browser action buttons within the container,
 // whether or not they are displayed.
 - (int)buttonCount;