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

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

Issue 242823002: Extract GetNodeByID() method from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert a change in bookmarks_helper.cc that colides with a wstring and cq does not like that Created 6 years, 8 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/strings/sys_string_conversions.h" 7 #include "base/strings/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_utils.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_finder.h" 14 #include "chrome/browser/ui/browser_finder.h"
15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
16 #import "chrome/browser/ui/cocoa/l10n_util.h" 16 #import "chrome/browser/ui/cocoa/l10n_util.h"
17 #include "chrome/browser/ui/host_desktop.h" 17 #include "chrome/browser/ui/host_desktop.h"
18 #include "content/public/browser/user_metrics.h" 18 #include "content/public/browser/user_metrics.h"
19 #import "ui/base/cocoa/cocoa_base_utils.h" 19 #import "ui/base/cocoa/cocoa_base_utils.h"
20 #import "ui/base/cocoa/menu_controller.h" 20 #import "ui/base/cocoa/menu_controller.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 73 }
74 74
75 // NSMenu delegate method: called just before menu is displayed. 75 // NSMenu delegate method: called just before menu is displayed.
76 - (void)menuNeedsUpdate:(NSMenu*)menu { 76 - (void)menuNeedsUpdate:(NSMenu*)menu {
77 bridge_->UpdateMenu(menu); 77 bridge_->UpdateMenu(menu);
78 } 78 }
79 79
80 // Return the a BookmarkNode that has the given id (called 80 // Return the a BookmarkNode that has the given id (called
81 // "identifier" here to avoid conflict with objc's concept of "id"). 81 // "identifier" here to avoid conflict with objc's concept of "id").
82 - (const BookmarkNode*)nodeForIdentifier:(int)identifier { 82 - (const BookmarkNode*)nodeForIdentifier:(int)identifier {
83 return bridge_->GetBookmarkModel()->GetNodeByID(identifier); 83 return GetBookmarkNodeByID(bridge_->GetBookmarkModel(), identifier);
84 } 84 }
85 85
86 // Open the URL of the given BookmarkNode in the current tab. 86 // Open the URL of the given BookmarkNode in the current tab.
87 - (void)openURLForNode:(const BookmarkNode*)node { 87 - (void)openURLForNode:(const BookmarkNode*)node {
88 Browser* browser = 88 Browser* browser =
89 chrome::FindTabbedBrowser(bridge_->GetProfile(), 89 chrome::FindTabbedBrowser(bridge_->GetProfile(),
90 true, 90 true,
91 chrome::HOST_DESKTOP_TYPE_NATIVE); 91 chrome::HOST_DESKTOP_TYPE_NATIVE);
92 if (!browser) { 92 if (!browser) {
93 browser = new Browser(Browser::CreateParams( 93 browser = new Browser(Browser::CreateParams(
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 - (IBAction)openAllBookmarksNewWindow:(id)sender { 152 - (IBAction)openAllBookmarksNewWindow:(id)sender {
153 [self openAll:[sender tag] withDisposition:NEW_WINDOW]; 153 [self openAll:[sender tag] withDisposition:NEW_WINDOW];
154 } 154 }
155 155
156 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { 156 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender {
157 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD]; 157 [self openAll:[sender tag] withDisposition:OFF_THE_RECORD];
158 } 158 }
159 159
160 @end // BookmarkMenuCocoaController 160 @end // BookmarkMenuCocoaController
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698