| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "base/sys_string_conversions.h" | 7 #include "base/sys_string_conversions.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU | 9 #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU |
| 10 #import "chrome/browser/app_controller_mac.h" | 10 #import "chrome/browser/app_controller_mac.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 } | 86 } |
| 87 | 87 |
| 88 // Open the URL of the given BookmarkNode in the current tab. | 88 // Open the URL of the given BookmarkNode in the current tab. |
| 89 - (void)openURLForNode:(const BookmarkNode*)node { | 89 - (void)openURLForNode:(const BookmarkNode*)node { |
| 90 Browser* browser = Browser::GetTabbedBrowser(bridge_->GetProfile(), true); | 90 Browser* browser = Browser::GetTabbedBrowser(bridge_->GetProfile(), true); |
| 91 if (!browser) | 91 if (!browser) |
| 92 browser = Browser::Create(bridge_->GetProfile()); | 92 browser = Browser::Create(bridge_->GetProfile()); |
| 93 WindowOpenDisposition disposition = | 93 WindowOpenDisposition disposition = |
| 94 event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); | 94 event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); |
| 95 browser->OpenURL(node->url(), GURL(), disposition, | 95 browser->OpenURL(node->url(), GURL(), disposition, |
| 96 PageTransition::AUTO_BOOKMARK); | 96 content::PAGE_TRANSITION_AUTO_BOOKMARK); |
| 97 } | 97 } |
| 98 | 98 |
| 99 // Open sites under BookmarkNode with the specified disposition. | 99 // Open sites under BookmarkNode with the specified disposition. |
| 100 - (void)openAll:(NSInteger)tag | 100 - (void)openAll:(NSInteger)tag |
| 101 withDisposition:(WindowOpenDisposition)disposition { | 101 withDisposition:(WindowOpenDisposition)disposition { |
| 102 int identifier = tag; | 102 int identifier = tag; |
| 103 | 103 |
| 104 const BookmarkNode* node = [self nodeForIdentifier:identifier]; | 104 const BookmarkNode* node = [self nodeForIdentifier:identifier]; |
| 105 DCHECK(node); | 105 DCHECK(node); |
| 106 | 106 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 | 142 |
| 143 - (IBAction)openAllBookmarksNewWindow:(id)sender { | 143 - (IBAction)openAllBookmarksNewWindow:(id)sender { |
| 144 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; | 144 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; |
| 145 } | 145 } |
| 146 | 146 |
| 147 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { | 147 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { |
| 148 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; | 148 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; |
| 149 } | 149 } |
| 150 | 150 |
| 151 @end // BookmarkMenuCocoaController | 151 @end // BookmarkMenuCocoaController |
| OLD | NEW |