Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

Issue 10692164: Remove browser::FindTabbedBrowser call in bookmark_utils.cc. All callers, with the exception of met… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 DCHECK(node); 113 DCHECK(node);
114 114
115 Browser* browser = browser::FindTabbedBrowser(bridge_->GetProfile(), true); 115 Browser* browser = browser::FindTabbedBrowser(bridge_->GetProfile(), true);
116 if (!browser) 116 if (!browser)
117 browser = Browser::Create(bridge_->GetProfile()); 117 browser = Browser::Create(bridge_->GetProfile());
118 DCHECK(browser); 118 DCHECK(browser);
119 119
120 if (!node || !browser) 120 if (!node || !browser)
121 return; // shouldn't be reached 121 return; // shouldn't be reached
122 122
123 bookmark_utils::OpenAll(NULL, browser->profile(), browser, node, 123 bookmark_utils::OpenAll(NULL, browser, node, disposition);
124 disposition);
125 124
126 if (disposition == NEW_FOREGROUND_TAB) { 125 if (disposition == NEW_FOREGROUND_TAB) {
127 content::RecordAction(UserMetricsAction("OpenAllBookmarks")); 126 content::RecordAction(UserMetricsAction("OpenAllBookmarks"));
128 } else if (disposition == NEW_WINDOW) { 127 } else if (disposition == NEW_WINDOW) {
129 content::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow")); 128 content::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow"));
130 } else { 129 } else {
131 content::RecordAction( 130 content::RecordAction(
132 UserMetricsAction("OpenAllBookmarksIncognitoWindow")); 131 UserMetricsAction("OpenAllBookmarksIncognitoWindow"));
133 } 132 }
134 } 133 }
(...skipping 15 matching lines...) Expand all
150 149
151 - (IBAction)openAllBookmarksNewWindow:(id)sender { 150 - (IBAction)openAllBookmarksNewWindow:(id)sender {
152 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; 151 [self openAll:[sender tag] withDisposition:NEW_WINDOW];
153 } 152 }
154 153
155 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { 154 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender {
156 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; 155 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD];
157 } 156 }
158 157
159 @end // BookmarkMenuCocoaController 158 @end // BookmarkMenuCocoaController
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698