diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmark_manager_controller.mm | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 6317a79..e3ed47b 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -17,6 +17,7 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/browser_window.h" #import "chrome/browser/cocoa/about_window_controller.h" +#import "chrome/browser/cocoa/bookmark_manager_controller.h" #import "chrome/browser/cocoa/bookmark_menu_bridge.h" #import "chrome/browser/cocoa/browser_window_cocoa.h" #import "chrome/browser/cocoa/browser_window_controller.h" @@ -585,6 +586,10 @@ static bool g_is_opening_new_window = false; initWithProfile:defaultProfile parentWindow:nil] runModalDialog]; break; } + case IDC_SHOW_BOOKMARK_MANAGER: + UserMetrics::RecordAction("ShowBookmarkManager", defaultProfile); + [BookmarkManagerController showBookmarkManager:defaultProfile]; + break; case IDC_SHOW_HISTORY: Browser::OpenHistoryWindow(defaultProfile); break; @@ -666,6 +671,7 @@ static bool g_is_opening_new_window = false; menuState_->UpdateCommandEnabled(IDC_RESTORE_TAB, false); menuState_->UpdateCommandEnabled(IDC_FOCUS_LOCATION, true); menuState_->UpdateCommandEnabled(IDC_FOCUS_SEARCH, true); + menuState_->UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true); menuState_->UpdateCommandEnabled(IDC_SHOW_HISTORY, true); menuState_->UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); menuState_->UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS, true); diff --git a/chrome/browser/cocoa/bookmark_manager_controller.mm b/chrome/browser/cocoa/bookmark_manager_controller.mm index ee9a83a..69c3ce1 100644 --- a/chrome/browser/cocoa/bookmark_manager_controller.mm +++ b/chrome/browser/cocoa/bookmark_manager_controller.mm @@ -465,6 +465,11 @@ class BookmarkManagerBridge : public BookmarkModelObserver { // The Bookmark Manager menu command _closes_ the window if it's frontmost. [self close]; break; + default: { + // Forward other commands to the AppController -- New Window etc. + [[NSApp delegate] commandDispatch:sender]; + break; + } } } @@ -473,7 +478,10 @@ class BookmarkManagerBridge : public BookmarkModelObserver { if (action == @selector(commandDispatch:) || action == @selector(commandDispatchUsingKeyModifiers:)) { NSInteger tag = [item tag]; - return (tag == IDC_FIND || tag == IDC_SHOW_BOOKMARK_MANAGER); + if (tag == IDC_FIND || tag == IDC_SHOW_BOOKMARK_MANAGER) + return YES; + // Let the AppController validate other commands -- New Window etc. + return [[NSApp delegate] validateUserInterfaceItem:item]; } else if (action == @selector(newFolder:) || action == @selector(delete:) || action == @selector(openItems:) || |