| 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 "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU | 8 #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU |
| 9 #import "chrome/browser/app_controller_mac.h" | 9 #import "chrome/browser/app_controller_mac.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.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/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_finder.h" | 14 #include "chrome/browser/ui/browser_finder.h" |
| 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" | 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" |
| 15 #include "chrome/browser/ui/cocoa/event_utils.h" | 16 #include "chrome/browser/ui/cocoa/event_utils.h" |
| 16 #include "chrome/browser/ui/cocoa/menu_controller.h" | 17 #include "chrome/browser/ui/cocoa/menu_controller.h" |
| 17 #include "content/public/browser/user_metrics.h" | 18 #include "content/public/browser/user_metrics.h" |
| 18 | 19 |
| 19 using content::OpenURLParams; | 20 using content::OpenURLParams; |
| 20 using content::Referrer; | 21 using content::Referrer; |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 browser::FindTabbedBrowser(bridge_->GetProfile(), | 114 browser::FindTabbedBrowser(bridge_->GetProfile(), |
| 114 true, | 115 true, |
| 115 chrome::HOST_DESKTOP_TYPE_NATIVE); | 116 chrome::HOST_DESKTOP_TYPE_NATIVE); |
| 116 if (!browser) | 117 if (!browser) |
| 117 browser = new Browser(Browser::CreateParams(bridge_->GetProfile())); | 118 browser = new Browser(Browser::CreateParams(bridge_->GetProfile())); |
| 118 DCHECK(browser); | 119 DCHECK(browser); |
| 119 | 120 |
| 120 if (!node || !browser) | 121 if (!node || !browser) |
| 121 return; // shouldn't be reached | 122 return; // shouldn't be reached |
| 122 | 123 |
| 123 chrome::OpenAll(NULL, browser, node, disposition); | 124 chrome::OpenAll(NULL, browser, node, disposition, browser->profile()); |
| 124 | 125 |
| 125 if (disposition == NEW_FOREGROUND_TAB) { | 126 if (disposition == NEW_FOREGROUND_TAB) { |
| 126 content::RecordAction(UserMetricsAction("OpenAllBookmarks")); | 127 content::RecordAction(UserMetricsAction("OpenAllBookmarks")); |
| 127 } else if (disposition == NEW_WINDOW) { | 128 } else if (disposition == NEW_WINDOW) { |
| 128 content::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow")); | 129 content::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow")); |
| 129 } else { | 130 } else { |
| 130 content::RecordAction( | 131 content::RecordAction( |
| 131 UserMetricsAction("OpenAllBookmarksIncognitoWindow")); | 132 UserMetricsAction("OpenAllBookmarksIncognitoWindow")); |
| 132 } | 133 } |
| 133 } | 134 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 149 | 150 |
| 150 - (IBAction)openAllBookmarksNewWindow:(id)sender { | 151 - (IBAction)openAllBookmarksNewWindow:(id)sender { |
| 151 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; | 152 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; |
| 152 } | 153 } |
| 153 | 154 |
| 154 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { | 155 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { |
| 155 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; | 156 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; |
| 156 } | 157 } |
| 157 | 158 |
| 158 @end // BookmarkMenuCocoaController | 159 @end // BookmarkMenuCocoaController |
| OLD | NEW |