diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 17:57:01 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 17:57:01 +0000 |
| commit | 2253121715b9ba8438caea82f3882315add755bf (patch) | |
| tree | 23fd3f00e3781b0dee2d72dffe3acd036c2ba209 /chrome/browser/cocoa/extensions/browser_action_button.mm | |
| parent | fbf16e65b0a4edca1036bd9e78ed0019500b8526 (diff) | |
| download | chromium_src-2253121715b9ba8438caea82f3882315add755bf.zip chromium_src-2253121715b9ba8438caea82f3882315add755bf.tar.gz chromium_src-2253121715b9ba8438caea82f3882315add755bf.tar.bz2 | |
[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
Diffstat (limited to 'chrome/browser/cocoa/extensions/browser_action_button.mm')
| -rw-r--r-- | chrome/browser/cocoa/extensions/browser_action_button.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/extensions/browser_action_button.mm b/chrome/browser/cocoa/extensions/browser_action_button.mm index 2c6cb67..6283708 100644 --- a/chrome/browser/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/cocoa/extensions/browser_action_button.mm @@ -92,9 +92,9 @@ class ExtensionImageTrackerBridge : public NotificationObserver, } - (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); @@ -114,7 +114,7 @@ class ExtensionImageTrackerBridge : public NotificationObserver, [self setShowsBorderOnlyWhileMouseInside:YES]; [self setMenu:[[[ExtensionActionContextMenu alloc] - initWithExtension:extension] autorelease]]; + initWithExtension:extension profile:profile] autorelease]]; tabId_ = tabId; extension_ = extension; |