chrome/browser/ui/bookmarks/bookmark_drag_drop.cc - Issue 176563002: Revert r252832: Eliminate Bookmarks dependence to bookmark_undo_utils.h.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_drag_drop.cc

Issue 176563002: Revert r252832: Eliminate Bookmarks dependence to bookmark_undo_utils.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 10 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/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc ('k') | chrome/browser/undo/bookmark_undo_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"	5 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"

6	6

7 #include "chrome/browser/bookmarks/bookmark_model.h"	7 #include "chrome/browser/bookmarks/bookmark_model.h"

8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

9 #include "chrome/browser/bookmarks/bookmark_node_data.h"	9 #include "chrome/browser/bookmarks/bookmark_node_data.h"

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

11 #include "chrome/browser/bookmarks/scoped_group_bookmark_actions.h"

12 #include "chrome/browser/undo/bookmark_undo_service.h"	11 #include "chrome/browser/undo/bookmark_undo_service.h"

13 #include "chrome/browser/undo/bookmark_undo_service_factory.h"	12 #include "chrome/browser/undo/bookmark_undo_service_factory.h"

	13 #include "chrome/browser/undo/bookmark_undo_utils.h"

14 #include "ui/base/dragdrop/drag_drop_types.h"	14 #include "ui/base/dragdrop/drag_drop_types.h"

15	15

16 namespace chrome {	16 namespace chrome {

17	17

18 int DropBookmarks(Profile* profile,	18 int DropBookmarks(Profile* profile,

19 const BookmarkNodeData& data,	19 const BookmarkNodeData& data,

20 const BookmarkNode* parent_node,	20 const BookmarkNode* parent_node,

21 int index) {	21 int index) {

22 #if !defined(OS_ANDROID)	22 #if !defined(OS_ANDROID)

23 ScopedGroupBookmarkActions group_drops(profile);	23 ScopedGroupBookmarkActions group_drops(profile);

(...skipping 12 matching lines...) Expand all Loading...
36 }	36 }

37 return ui::DragDropTypes::DRAG_NONE;	37 return ui::DragDropTypes::DRAG_NONE;

38 }	38 }

39 // Dropping a folder from different profile. Always accept.	39 // Dropping a folder from different profile. Always accept.

40 bookmark_utils::CloneBookmarkNode(model, data.elements, parent_node,	40 bookmark_utils::CloneBookmarkNode(model, data.elements, parent_node,

41 index, true);	41 index, true);

42 return ui::DragDropTypes::DRAG_COPY;	42 return ui::DragDropTypes::DRAG_COPY;

43 }	43 }

44	44

45 } // namespace chrome	45 } // namespace chrome

OLD	NEW