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 #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 // Return the a BookmarkNode that has the given id (called | 88 // Return the a BookmarkNode that has the given id (called |
89 // "identifier" here to avoid conflict with objc's concept of "id"). | 89 // "identifier" here to avoid conflict with objc's concept of "id"). |
90 - (const BookmarkNode*)nodeForIdentifier:(int)identifier { | 90 - (const BookmarkNode*)nodeForIdentifier:(int)identifier { |
91 return bridge_->GetBookmarkModel()->GetNodeByID(identifier); | 91 return bridge_->GetBookmarkModel()->GetNodeByID(identifier); |
92 } | 92 } |
93 | 93 |
94 // Open the URL of the given BookmarkNode in the current tab. | 94 // Open the URL of the given BookmarkNode in the current tab. |
95 - (void)openURLForNode:(const BookmarkNode*)node { | 95 - (void)openURLForNode:(const BookmarkNode*)node { |
96 Browser* browser = browser::FindTabbedBrowser(bridge_->GetProfile(), true); | 96 Browser* browser = |
| 97 browser::FindTabbedBrowser(bridge_->GetProfile(), |
| 98 true, |
| 99 chrome::HOST_DESKTOP_TYPE_NATIVE); |
97 if (!browser) | 100 if (!browser) |
98 browser = new Browser(Browser::CreateParams(bridge_->GetProfile())); | 101 browser = new Browser(Browser::CreateParams(bridge_->GetProfile())); |
99 WindowOpenDisposition disposition = | 102 WindowOpenDisposition disposition = |
100 event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); | 103 event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); |
101 OpenURLParams params( | 104 OpenURLParams params( |
102 node->url(), Referrer(), disposition, | 105 node->url(), Referrer(), disposition, |
103 content::PAGE_TRANSITION_AUTO_BOOKMARK, false); | 106 content::PAGE_TRANSITION_AUTO_BOOKMARK, false); |
104 browser->OpenURL(params); | 107 browser->OpenURL(params); |
105 } | 108 } |
106 | 109 |
107 // Open sites under BookmarkNode with the specified disposition. | 110 // Open sites under BookmarkNode with the specified disposition. |
108 - (void)openAll:(NSInteger)tag | 111 - (void)openAll:(NSInteger)tag |
109 withDisposition:(WindowOpenDisposition)disposition { | 112 withDisposition:(WindowOpenDisposition)disposition { |
110 int identifier = tag; | 113 int identifier = tag; |
111 | 114 |
112 const BookmarkNode* node = [self nodeForIdentifier:identifier]; | 115 const BookmarkNode* node = [self nodeForIdentifier:identifier]; |
113 DCHECK(node); | 116 DCHECK(node); |
114 | 117 |
115 Browser* browser = browser::FindTabbedBrowser(bridge_->GetProfile(), true); | 118 Browser* browser = |
| 119 browser::FindTabbedBrowser(bridge_->GetProfile(), |
| 120 true, |
| 121 chrome::HOST_DESKTOP_TYPE_NATIVE); |
116 if (!browser) | 122 if (!browser) |
117 browser = new Browser(Browser::CreateParams(bridge_->GetProfile())); | 123 browser = new Browser(Browser::CreateParams(bridge_->GetProfile())); |
118 DCHECK(browser); | 124 DCHECK(browser); |
119 | 125 |
120 if (!node || !browser) | 126 if (!node || !browser) |
121 return; // shouldn't be reached | 127 return; // shouldn't be reached |
122 | 128 |
123 bookmark_utils::OpenAll(NULL, browser, node, disposition); | 129 bookmark_utils::OpenAll(NULL, browser, node, disposition); |
124 | 130 |
125 if (disposition == NEW_FOREGROUND_TAB) { | 131 if (disposition == NEW_FOREGROUND_TAB) { |
(...skipping 23 matching lines...) Expand all Loading... |
149 | 155 |
150 - (IBAction)openAllBookmarksNewWindow:(id)sender { | 156 - (IBAction)openAllBookmarksNewWindow:(id)sender { |
151 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; | 157 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; |
152 } | 158 } |
153 | 159 |
154 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { | 160 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { |
155 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; | 161 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; |
156 } | 162 } |
157 | 163 |
158 @end // BookmarkMenuCocoaController | 164 @end // BookmarkMenuCocoaController |
OLD | NEW |