From a0677ea002fc5d27c42e43d4331dbc7f99ee6a88 Mon Sep 17 00:00:00 2001 From: "snej@chromium.org" Date: Sat, 16 Jan 2010 00:31:01 +0000 Subject: Mac: "Bookmark Manager" menu command closes window if it's already frontmost. BUG=32331 TEST=Open bookmark manager, choose "Bookmark Manager" menu command again: it should close. Or open, then activate browser window, then choose command again: it'll come to the front. Review URL: http://codereview.chromium.org/536072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36437 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/bookmark_manager_controller.mm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'chrome/browser') diff --git a/chrome/browser/cocoa/bookmark_manager_controller.mm b/chrome/browser/cocoa/bookmark_manager_controller.mm index 8aea2d4..f47f0c1 100644 --- a/chrome/browser/cocoa/bookmark_manager_controller.mm +++ b/chrome/browser/cocoa/bookmark_manager_controller.mm @@ -422,9 +422,15 @@ class BookmarkManagerBridge : public BookmarkModelObserver { } } - if ([sender tag] == IDC_FIND) { - [[[self window] toolbar] setVisible:YES]; - [[self window] makeFirstResponder:toolbarSearchView_]; + switch ([sender tag]) { + case IDC_FIND: + [[[self window] toolbar] setVisible:YES]; + [[self window] makeFirstResponder:toolbarSearchView_]; + break; + case IDC_SHOW_BOOKMARK_MANAGER: + // The Bookmark Manager menu command _closes_ the window if it's frontmost. + [self close]; + break; } } @@ -433,7 +439,7 @@ class BookmarkManagerBridge : public BookmarkModelObserver { if (action == @selector(commandDispatch:) || action == @selector(commandDispatchUsingKeyModifiers:)) { NSInteger tag = [item tag]; - return (tag == IDC_FIND); + return (tag == IDC_FIND || tag == IDC_SHOW_BOOKMARK_MANAGER); } else if (action == @selector(newFolder:) || action == @selector(delete:)) { return [[self focusedController] validateUserInterfaceItem:item]; } -- cgit v1.1