diff options
Diffstat (limited to 'chrome/browser/cocoa')
9 files changed, 19 insertions, 19 deletions
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm index 33e61c2..3ba0fc9 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm @@ -2142,7 +2142,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { - (BOOL)dragBookmarkData:(id<NSDraggingInfo>)info { BOOL dragged = NO; - std::vector<const BookmarkNode*> nodes([self retrieveBookmarkDragDataNodes]); + std::vector<const BookmarkNode*> nodes([self retrieveBookmarkNodeData]); if (nodes.size()) { BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove); NSPoint dropPoint = [info draggingLocation]; @@ -2155,9 +2155,9 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { return dragged; } -- (std::vector<const BookmarkNode*>)retrieveBookmarkDragDataNodes { +- (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData { std::vector<const BookmarkNode*> dragDataNodes; - BookmarkDragData dragData; + BookmarkNodeData dragData; if(dragData.ReadFromDragClipboard()) { BookmarkModel* bookmarkModel = [self bookmarkModel]; Profile* profile = bookmarkModel->profile(); diff --git a/chrome/browser/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index 9abdb0a..2d72804 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -160,7 +160,7 @@ dragDataNode_ = node; } -- (std::vector<const BookmarkNode*>)retrieveBookmarkDragDataNodes { +- (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData { std::vector<const BookmarkNode*> dragDataNodes; if(dragDataNode_) { dragDataNodes.push_back(dragDataNode_); diff --git a/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.mm index 6eaca1a..55fa2d0 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.mm @@ -1137,7 +1137,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { // http://crbug.com/35966 - (BOOL)dragBookmarkData:(id<NSDraggingInfo>)info { BOOL dragged = NO; - std::vector<const BookmarkNode*> nodes([self retrieveBookmarkDragDataNodes]); + std::vector<const BookmarkNode*> nodes([self retrieveBookmarkNodeData]); if (nodes.size()) { BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove); NSPoint dropPoint = [info draggingLocation]; @@ -1152,9 +1152,9 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { // TODO(mrossetti,jrg): Identical to the same function in BookmarkBarController. // http://crbug.com/35966 -- (std::vector<const BookmarkNode*>)retrieveBookmarkDragDataNodes { +- (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData { std::vector<const BookmarkNode*> dragDataNodes; - BookmarkDragData dragData; + BookmarkNodeData dragData; if(dragData.ReadFromDragClipboard()) { BookmarkModel* bookmarkModel = [self bookmarkModel]; Profile* profile = bookmarkModel->profile(); diff --git a/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm index ee9ccb8..890c0fc 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm @@ -1299,7 +1299,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, HoverThenDeleteBookmark) { dragDataNode_ = node; } -- (std::vector<const BookmarkNode*>)retrieveBookmarkDragDataNodes { +- (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData { std::vector<const BookmarkNode*> dragDataNodes; if(dragDataNode_) { dragDataNodes.push_back(dragDataNode_); diff --git a/chrome/browser/cocoa/bookmarks/bookmark_button.h b/chrome/browser/cocoa/bookmarks/bookmark_button.h index 56d9bc1..5d8574c 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_button.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_button.h @@ -9,7 +9,7 @@ @class BookmarkBarFolderController; @class BookmarkButton; -struct BookmarkDragData; +struct BookmarkNodeData; class BookmarkModel; class BookmarkNode; @class BrowserWindowController; @@ -97,7 +97,7 @@ class ThemeProvider; // Determine if the drag pasteboard has any drag data of type // kBookmarkDictionaryListPboardType and, if so, return those elements // otherwise return an empty vector. -- (std::vector<const BookmarkNode*>)retrieveBookmarkDragDataNodes; +- (std::vector<const BookmarkNode*>)retrieveBookmarkNodeData; // Return YES if we should show the drop indicator, else NO. In some // cases (e.g. hover open) we don't want to show the drop indicator. diff --git a/chrome/browser/cocoa/bookmarks/bookmark_drag_source.h b/chrome/browser/cocoa/bookmarks/bookmark_drag_source.h index fde2086..5c33797 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_drag_source.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_drag_source.h @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "chrome/browser/bookmarks/bookmark_drag_data.h" +#include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/cocoa/web_contents_drag_source.h" // A class that handles tracking and event processing for a drag and drop @@ -12,7 +12,7 @@ @interface BookmarkDragSource : WebContentsDragSource { @private // Our drop data. Should only be initialized once. - std::vector<BookmarkDragData::Element> dropData_; + std::vector<BookmarkNodeData::Element> dropData_; Profile* profile_; } @@ -22,7 +22,7 @@ // with data types appropriate for dropData. - (id)initWithContentsView:(TabContentsViewCocoa*)contentsView dropData: - (const std::vector<BookmarkDragData::Element>&)dropData + (const std::vector<BookmarkNodeData::Element>&)dropData profile:(Profile*)profile pasteboard:(NSPasteboard*)pboard dragOperationMask:(NSDragOperation)dragOperationMask; diff --git a/chrome/browser/cocoa/bookmarks/bookmark_drag_source.mm b/chrome/browser/cocoa/bookmarks/bookmark_drag_source.mm index f6c024c..64f9de2 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_drag_source.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_drag_source.mm @@ -12,7 +12,7 @@ - (id)initWithContentsView:(TabContentsViewCocoa*)contentsView dropData: - (const std::vector<BookmarkDragData::Element>&)dropData + (const std::vector<BookmarkNodeData::Element>&)dropData profile:(Profile*)profile pasteboard:(NSPasteboard*)pboard dragOperationMask:(NSDragOperation)dragOperationMask { diff --git a/chrome/browser/cocoa/web_contents_drag_source.h b/chrome/browser/cocoa/web_contents_drag_source.h index 168ce31..1b8baaa 100644 --- a/chrome/browser/cocoa/web_contents_drag_source.h +++ b/chrome/browser/cocoa/web_contents_drag_source.h @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #include "base/scoped_nsobject.h" -#include "chrome/browser/bookmarks/bookmark_drag_data.h" +#include "chrome/browser/bookmarks/bookmark_node_data.h" @class TabContentsViewCocoa; diff --git a/chrome/browser/cocoa/web_drop_target.mm b/chrome/browser/cocoa/web_drop_target.mm index 915990a..fdc8bcc 100644 --- a/chrome/browser/cocoa/web_drop_target.mm +++ b/chrome/browser/cocoa/web_drop_target.mm @@ -5,7 +5,7 @@ #import "chrome/browser/cocoa/web_drop_target.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/bookmarks/bookmark_drag_data.h" +#include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -83,7 +83,7 @@ using WebKit::WebDragOperationsMask; // If the tab is showing the boomark manager, send BookmarkDrag events RenderViewHostDelegate::BookmarkDrag* dragDelegate = tabContents_->GetBookmarkDragDelegate(); - BookmarkDragData dragData; + BookmarkNodeData dragData; if(dragDelegate && dragData.ReadFromDragClipboard()) dragDelegate->OnDragEnter(dragData); @@ -144,7 +144,7 @@ using WebKit::WebDragOperationsMask; // If the tab is showing the boomark manager, send BookmarkDrag events RenderViewHostDelegate::BookmarkDrag* dragDelegate = tabContents_->GetBookmarkDragDelegate(); - BookmarkDragData dragData; + BookmarkNodeData dragData; if(dragDelegate && dragData.ReadFromDragClipboard()) dragDelegate->OnDragOver(dragData); return current_operation_; @@ -174,7 +174,7 @@ using WebKit::WebDragOperationsMask; // If the tab is showing the boomark manager, send BookmarkDrag events RenderViewHostDelegate::BookmarkDrag* dragDelegate = tabContents_->GetBookmarkDragDelegate(); - BookmarkDragData dragData; + BookmarkNodeData dragData; if(dragDelegate && dragData.ReadFromDragClipboard()) dragDelegate->OnDrop(dragData); |