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

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

Issue 11779019: browser: Move FindTabbedBrowser() function into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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
« no previous file with comments | « chrome/browser/ui/browser_win.cc ('k') | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 // Return the a BookmarkNode that has the given id (called 83 // Return the a BookmarkNode that has the given id (called
84 // "identifier" here to avoid conflict with objc's concept of "id"). 84 // "identifier" here to avoid conflict with objc's concept of "id").
85 - (const BookmarkNode*)nodeForIdentifier:(int)identifier { 85 - (const BookmarkNode*)nodeForIdentifier:(int)identifier {
86 return bridge_->GetBookmarkModel()->GetNodeByID(identifier); 86 return bridge_->GetBookmarkModel()->GetNodeByID(identifier);
87 } 87 }
88 88
89 // Open the URL of the given BookmarkNode in the current tab. 89 // Open the URL of the given BookmarkNode in the current tab.
90 - (void)openURLForNode:(const BookmarkNode*)node { 90 - (void)openURLForNode:(const BookmarkNode*)node {
91 Browser* browser = 91 Browser* browser =
92 browser::FindTabbedBrowser(bridge_->GetProfile(), 92 chrome::FindTabbedBrowser(bridge_->GetProfile(),
93 true, 93 true,
94 chrome::HOST_DESKTOP_TYPE_NATIVE); 94 chrome::HOST_DESKTOP_TYPE_NATIVE);
95 if (!browser) 95 if (!browser)
96 browser = new Browser(Browser::CreateParams(bridge_->GetProfile())); 96 browser = new Browser(Browser::CreateParams(bridge_->GetProfile()));
97 WindowOpenDisposition disposition = 97 WindowOpenDisposition disposition =
98 event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); 98 event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
99 OpenURLParams params( 99 OpenURLParams params(
100 node->url(), Referrer(), disposition, 100 node->url(), Referrer(), disposition,
101 content::PAGE_TRANSITION_AUTO_BOOKMARK, false); 101 content::PAGE_TRANSITION_AUTO_BOOKMARK, false);
102 browser->OpenURL(params); 102 browser->OpenURL(params);
103 } 103 }
104 104
105 // Open sites under BookmarkNode with the specified disposition. 105 // Open sites under BookmarkNode with the specified disposition.
106 - (void)openAll:(NSInteger)tag 106 - (void)openAll:(NSInteger)tag
107 withDisposition:(WindowOpenDisposition)disposition { 107 withDisposition:(WindowOpenDisposition)disposition {
108 int identifier = tag; 108 int identifier = tag;
109 109
110 const BookmarkNode* node = [self nodeForIdentifier:identifier]; 110 const BookmarkNode* node = [self nodeForIdentifier:identifier];
111 DCHECK(node); 111 DCHECK(node);
112 112
113 Browser* browser = 113 Browser* browser =
114 browser::FindTabbedBrowser(bridge_->GetProfile(), 114 chrome::FindTabbedBrowser(bridge_->GetProfile(),
115 true, 115 true,
116 chrome::HOST_DESKTOP_TYPE_NATIVE); 116 chrome::HOST_DESKTOP_TYPE_NATIVE);
117 if (!browser) 117 if (!browser)
118 browser = new Browser(Browser::CreateParams(bridge_->GetProfile())); 118 browser = new Browser(Browser::CreateParams(bridge_->GetProfile()));
119 DCHECK(browser); 119 DCHECK(browser);
120 120
121 if (!node || !browser) 121 if (!node || !browser)
122 return; // shouldn't be reached 122 return; // shouldn't be reached
123 123
124 chrome::OpenAll(NULL, browser, node, disposition, browser->profile()); 124 chrome::OpenAll(NULL, browser, node, disposition, browser->profile());
125 125
126 if (disposition == NEW_FOREGROUND_TAB) { 126 if (disposition == NEW_FOREGROUND_TAB) {
(...skipping 23 matching lines...) Expand all
150 150
151 - (IBAction)openAllBookmarksNewWindow:(id)sender { 151 - (IBAction)openAllBookmarksNewWindow:(id)sender {
152 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; 152 [self openAll:[sender tag] withDisposition:NEW_WINDOW];
153 } 153 }
154 154
155 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { 155 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender {
156 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; 156 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD];
157 } 157 }
158 158
159 @end // BookmarkMenuCocoaController 159 @end // BookmarkMenuCocoaController
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_win.cc ('k') | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698