diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 17:28:32 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 17:28:32 +0000 |
| commit | 8c376a5e743dfbbcea5cd11ddaa4d6944e439431 (patch) | |
| tree | 8de24992442b07ff5a23b0208d1f6d33cbad14b2 /chrome/browser/cocoa/tab_controller.mm | |
| parent | d01120e6c225d4922d0f932ab6ef4f3709dcaa17 (diff) | |
| download | chromium_src-8c376a5e743dfbbcea5cd11ddaa4d6944e439431.zip chromium_src-8c376a5e743dfbbcea5cd11ddaa4d6944e439431.tar.gz chromium_src-8c376a5e743dfbbcea5cd11ddaa4d6944e439431.tar.bz2 | |
[Mac] Plumb the pinned tab flag through TabController so the context menu uses the correct state.
BUG=42339
TEST=Create tab, pin it. Unpin it. Context menu works as before.
Review URL: http://codereview.chromium.org/2057002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/tab_controller.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/tab_controller.mm b/chrome/browser/cocoa/tab_controller.mm index f2f76db..5440067 100644 --- a/chrome/browser/cocoa/tab_controller.mm +++ b/chrome/browser/cocoa/tab_controller.mm @@ -16,6 +16,7 @@ @synthesize loadingState = loadingState_; @synthesize mini = mini_; +@synthesize pinned = pinned_; @synthesize phantom = phantom_; @synthesize target = target_; @synthesize action = action_; @@ -125,9 +126,8 @@ class MenuDelegate : public menus::SimpleMenuModel::Delegate { - (NSMenu*)menu { contextMenuDelegate_.reset( new TabControllerInternal::MenuDelegate(target_, self)); - // TODO(42339): this is wrong, it should use pinned, not mini. contextMenuModel_.reset(new TabMenuModel(contextMenuDelegate_.get(), - [self mini])); + [self pinned])); contextMenuController_.reset( [[MenuController alloc] initWithModel:contextMenuModel_.get() useWithPopUpButtonCell:NO]); |