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

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

Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks
Patch Set: Replace in .mm files Created 4 years, 4 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
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 11 matching lines...) Expand all
22 using bookmarks::BookmarkNode; 22 using bookmarks::BookmarkNode;
23 using bookmarks::BookmarkNodeData; 23 using bookmarks::BookmarkNodeData;
24 24
25 namespace chrome { 25 namespace chrome {
26 26
27 int DropBookmarks(Profile* profile, 27 int DropBookmarks(Profile* profile,
28 const BookmarkNodeData& data, 28 const BookmarkNodeData& data,
29 const BookmarkNode* parent_node, 29 const BookmarkNode* parent_node,
30 int index, 30 int index,
31 bool copy) { 31 bool copy) {
32 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile); 32 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile);
33 #if !defined(OS_ANDROID) 33 #if !defined(OS_ANDROID)
34 bookmarks::ScopedGroupBookmarkActions group_drops(model); 34 bookmarks::ScopedGroupBookmarkActions group_drops(model);
35 #endif 35 #endif
36 if (data.IsFromProfilePath(profile->GetPath())) { 36 if (data.IsFromProfilePath(profile->GetPath())) {
37 const std::vector<const BookmarkNode*> dragged_nodes = 37 const std::vector<const BookmarkNode*> dragged_nodes =
38 data.GetNodes(model, profile->GetPath()); 38 data.GetNodes(model, profile->GetPath());
39 DCHECK(model->client()->CanBeEditedByUser(parent_node)); 39 DCHECK(model->client()->CanBeEditedByUser(parent_node));
40 DCHECK(copy || 40 DCHECK(copy ||
41 bookmarks::CanAllBeEditedByUser(model->client(), dragged_nodes)); 41 bookmarks::CanAllBeEditedByUser(model->client(), dragged_nodes));
42 if (!dragged_nodes.empty()) { 42 if (!dragged_nodes.empty()) {
43 // Drag from same profile. Copy or move nodes. 43 // Drag from same profile. Copy or move nodes.
44 for (size_t i = 0; i < dragged_nodes.size(); ++i) { 44 for (size_t i = 0; i < dragged_nodes.size(); ++i) {
45 if (copy) { 45 if (copy) {
46 model->Copy(dragged_nodes[i], parent_node, index); 46 model->Copy(dragged_nodes[i], parent_node, index);
47 } else { 47 } else {
48 model->Move(dragged_nodes[i], parent_node, index); 48 model->Move(dragged_nodes[i], parent_node, index);
49 } 49 }
50 index = parent_node->GetIndexOf(dragged_nodes[i]) + 1; 50 index = parent_node->GetIndexOf(dragged_nodes[i]) + 1;
51 } 51 }
52 return copy ? ui::DragDropTypes::DRAG_COPY : ui::DragDropTypes::DRAG_MOVE; 52 return copy ? ui::DragDropTypes::DRAG_COPY : ui::DragDropTypes::DRAG_MOVE;
53 } 53 }
54 return ui::DragDropTypes::DRAG_NONE; 54 return ui::DragDropTypes::DRAG_NONE;
55 } 55 }
56 // Dropping a folder from different profile. Always accept. 56 // Dropping a folder from different profile. Always accept.
57 bookmarks::CloneBookmarkNode(model, data.elements, parent_node, index, true); 57 bookmarks::CloneBookmarkNode(model, data.elements, parent_node, index, true);
58 return ui::DragDropTypes::DRAG_COPY; 58 return ui::DragDropTypes::DRAG_COPY;
59 } 59 }
60 60
61 } // namespace chrome 61 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698