diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
5 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index fe473f82..25b267f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -13,6 +13,7 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_stats.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_properties.h" @@ -1025,7 +1026,7 @@ void RecordAppLaunch(Profile* profile, GURL url) { - (IBAction)openBookmarkMenuItem:(id)sender { int64 tag = [self nodeIdFromMenuTag:[sender tag]]; - const BookmarkNode* node = bookmarkModel_->GetNodeByID(tag); + const BookmarkNode* node = GetBookmarkNodeByID(bookmarkModel_, tag); WindowOpenDisposition disposition = ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); [self openURL:node->url() disposition:disposition]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index 52b110a..c99287c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -703,7 +703,7 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) { EXPECT_TRUE(item); if (item) { int64 tag = [bar_ nodeIdFromMenuTag:[item tag]]; - const BookmarkNode* node = model->GetNodeByID(tag); + const BookmarkNode* node = GetBookmarkNodeByID(model, tag); EXPECT_TRUE(node); EXPECT_EQ(gurl, node->url()); } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm index 3a62c85..9c3d35b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm @@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" @@ -161,7 +162,7 @@ using base::UserMetricsAction; const BookmarkModel* const model = [[self controller] bookmarkModel]; const BookmarkNode* const source_node = [button bookmarkNode]; const BookmarkNode* const target_node = - model->GetNodeByID(source_node->id()); + GetBookmarkNodeByID(model, source_node->id()); BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove) || diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm index 651f35d..8b78dd4 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm @@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/themes/theme_properties.h" #import "chrome/browser/themes/theme_service.h" @@ -226,7 +227,7 @@ using base::UserMetricsAction; const BookmarkModel* const model = [[self controller] bookmarkModel]; const BookmarkNode* const source_node = [button bookmarkNode]; const BookmarkNode* const target_node = - model->GetNodeByID(source_node->id()); + GetBookmarkNodeByID(model, source_node->id()); BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove) || diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm index e5b391a..43a49e2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm @@ -7,7 +7,7 @@ #include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU #import "chrome/browser/app_controller_mac.h" -#include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/browser.h" @@ -80,7 +80,7 @@ const NSUInteger kMaximumMenuPixelsWide = 300; // Return the a BookmarkNode that has the given id (called // "identifier" here to avoid conflict with objc's concept of "id"). - (const BookmarkNode*)nodeForIdentifier:(int)identifier { - return bridge_->GetBookmarkModel()->GetNodeByID(identifier); + return GetBookmarkNodeByID(bridge_->GetBookmarkModel(), identifier); } // Open the URL of the given BookmarkNode in the current tab. |