[Mac] Use the ExtensionToolbarModel for ordering of the Browser Actions. Prep...

chrome/browser/cocoa/extensions/browser_action_button.mm

 // 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.
 
 #import "chrome/browser/cocoa/extensions/browser_action_button.h"
 
 #include "app/gfx/canvas_paint.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/sys_string_conversions.h"
@@ skipping 74 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ExtensionImageTrackerBridge);
 };
 
 @implementation BrowserActionButton
 
 + (Class)cellClass {
   return [BrowserActionCell class];
 }
 
 - (id)initWithExtension:(Extension*)extension
-                  tabId:(int)tabId
-                xOffset:(int)xOffset {
-  NSRect frame = NSMakeRect(xOffset,
+                profile:(Profile*)profile
+                  tabId:(int)tabId {
+  NSRect frame = NSMakeRect(0.0,
                             kBrowserActionOriginYOffset,
                             kBrowserActionWidth,
                             kBrowserActionHeight);
   if ((self = [super initWithFrame:frame])) {
     BrowserActionCell* cell = [[[BrowserActionCell alloc] init] autorelease];
     // [NSButton setCell:] warns to NOT use setCell: other than in the
     // initializer of a control.  However, we are using a basic
     // NSButton whose initializer does not take an NSCell as an
     // object.  To honor the assumed semantics, we do nothing with
     // NSButton between alloc/init and setCell:.
     [self setCell:cell];
     [cell setTabId:tabId];
     [cell setExtensionAction:extension->browser_action()];
 
     [self setTitle:@""];
     [self setButtonType:NSMomentaryChangeButton];
     [self setShowsBorderOnlyWhileMouseInside:YES];
 
     [self setMenu:[[[ExtensionActionContextMenu alloc]
-        initWithExtension:extension] autorelease]];
+        initWithExtension:extension profile:profile] autorelease]];
 
     tabId_ = tabId;
     extension_ = extension;
     imageLoadingBridge_.reset(new ExtensionImageTrackerBridge(self, extension));
 
     [self updateState];
   }
 
   return self;
 }
@@ skipping 59 matching lines @@
     extensionAction_->PaintBadge(&canvas, boundingRect, tabId_);
   }
 
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @synthesize tabId = tabId_;
 @synthesize extensionAction = extensionAction_;
 
 @end