chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc - Issue 12475013: bookmarks: Extract PerformBookmarkDrop() function out of bookmark_utils.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 12475013: bookmarks: Extract PerformBookmarkDrop() function out of bookmark_utils.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chromeos fixes Created 7 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_drag_drop_gtk.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_drag_drop.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

index ba42b0262997420f70768aac4415da0aa9ebbc15..65d60f56a6d7af23c280e46a5b4dedcddb18e489 100644

--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

@@ -27,6 +27,7 @@

#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/themes/theme_properties.h"

#include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h"

+#include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"

#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"

#include "chrome/browser/ui/bookmarks/bookmark_utils.h"

#include "chrome/browser/ui/browser.h"

@@ -35,7 +36,7 @@

#include "chrome/browser/ui/view_ids.h"

#include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h"

#include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"

-#include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop.h"

+#include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h"

#include "chrome/browser/ui/views/event_utils.h"

#include "chrome/browser/ui/views/frame/browser_view.h"

#include "chrome/browser/ui/views/location_bar/location_bar_view.h"

@@ -896,8 +897,7 @@ int BookmarkBarView::OnPerformDrop(const DropTargetEvent& event) {

const BookmarkNodeData data = drop_info_->data;

DCHECK(data.is_valid());

drop_info_.reset();

- return bookmark_utils::PerformBookmarkDrop(browser_->profile(), data,

- parent_node, index);

+ return chrome::DropBookmarks(browser_->profile(), data, parent_node, index);

}

void BookmarkBarView::ShowContextMenu(const gfx::Point& p,