| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" | 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" |
| 6 | 6 |
| 7 #import "base/mac/foundation_util.h" |
| 7 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 8 #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU | 9 #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU |
| 9 #import "chrome/browser/app_controller_mac.h" | 10 #import "chrome/browser/app_controller_mac.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" | 13 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" |
| 13 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
| 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" | 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" |
| 16 #import "chrome/browser/ui/cocoa/l10n_util.h" | 17 #import "chrome/browser/ui/cocoa/l10n_util.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 if ([[self menu] delegate] == self) | 65 if ([[self menu] delegate] == self) |
| 65 [[self menu] setDelegate:nil]; | 66 [[self menu] setDelegate:nil]; |
| 66 [super dealloc]; | 67 [super dealloc]; |
| 67 } | 68 } |
| 68 | 69 |
| 69 - (NSMenu*)menu { | 70 - (NSMenu*)menu { |
| 70 return menu_; | 71 return menu_; |
| 71 } | 72 } |
| 72 | 73 |
| 73 - (BOOL)validateMenuItem:(NSMenuItem*)menuItem { | 74 - (BOOL)validateMenuItem:(NSMenuItem*)menuItem { |
| 74 AppController* controller = [NSApp delegate]; | 75 AppController* controller = |
| 76 base::mac::ObjCCastStrict<AppController>([NSApp delegate]); |
| 75 return ![controller keyWindowIsModal]; | 77 return ![controller keyWindowIsModal]; |
| 76 } | 78 } |
| 77 | 79 |
| 78 // NSMenu delegate method: called just before menu is displayed. | 80 // NSMenu delegate method: called just before menu is displayed. |
| 79 - (void)menuNeedsUpdate:(NSMenu*)menu { | 81 - (void)menuNeedsUpdate:(NSMenu*)menu { |
| 80 bridge_->UpdateMenu(menu); | 82 bridge_->UpdateMenu(menu); |
| 81 } | 83 } |
| 82 | 84 |
| 83 // Return the a BookmarkNode that has the given id (called | 85 // Return the a BookmarkNode that has the given id (called |
| 84 // "identifier" here to avoid conflict with objc's concept of "id"). | 86 // "identifier" here to avoid conflict with objc's concept of "id"). |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 149 |
| 148 - (IBAction)openAllBookmarksNewWindow:(id)sender { | 150 - (IBAction)openAllBookmarksNewWindow:(id)sender { |
| 149 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; | 151 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; |
| 150 } | 152 } |
| 151 | 153 |
| 152 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { | 154 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { |
| 153 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; | 155 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; |
| 154 } | 156 } |
| 155 | 157 |
| 156 @end // BookmarkMenuCocoaController | 158 @end // BookmarkMenuCocoaController |
| OLD | NEW |