Merge 54782 - [Mac] Adjust toolbar spacing of browser actions for M6....

chrome/browser/cocoa/extensions/browser_action_button.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_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_
 #define CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 
 class Extension;
 class ExtensionAction;
 class ExtensionImageTrackerBridge;
 class Profile;
 
 // Fired when the Browser Action's state has changed. Usually the image needs to
 // be updated.
 extern NSString* const kBrowserActionButtonUpdatedNotification;
 
 // Fired on each drag event while the user is moving the button.
 extern NSString* const kBrowserActionButtonDraggingNotification;
 // Fired when the user drops the button.
 extern NSString* const kBrowserActionButtonDragEndNotification;
 
-extern const CGFloat kBrowserActionWidth;
-
 @interface BrowserActionButton : NSButton {
  @private
   // Bridge to proxy Chrome notifications to the Obj-C class as well as load the
   // extension's icon.
   scoped_ptr<ExtensionImageTrackerBridge> imageLoadingBridge_;
 
   // The default icon of the Button.
   scoped_nsobject<NSImage> defaultIcon_;
 
   // The icon specific to the active tab.
@@ skipping 10 matching lines @@
 
   // Whether the button is currently being dragged.
   BOOL isBeingDragged_;
 
   // Drag events could be intercepted by other buttons, so to make sure that
   // this is the only button moving if it ends up being dragged. This is set to
   // YES upon |mouseDown:|.
   BOOL dragCouldStart_;
 }
 
-- (id)initWithExtension:(Extension*)extension
-                profile:(Profile*)profile
-                  tabId:(int)tabId;
+- (id)initWithFrame:(NSRect)frame
+          extension:(Extension*)extension
+            profile:(Profile*)profile
+              tabId:(int)tabId;
 
 - (void)setFrame:(NSRect)frameRect animate:(BOOL)animate;
 
 - (void)setDefaultIcon:(NSImage*)image;
 
 - (void)setTabSpecificIcon:(NSImage*)image;
 
 - (void)updateState;
 
 - (BOOL)isAnimating;
@@ skipping 16 matching lines @@
   // The action we're drawing the cell for. Weak.
   ExtensionAction* extensionAction_;
 }
 
 @property(readwrite, nonatomic) int tabId;
 @property(readwrite, nonatomic) ExtensionAction* extensionAction;
 
 @end
 
 #endif  // CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_