chrome/browser/ui/bookmarks/bookmark_drag_drop.cc - Issue 1203713002: Limit access to ChromeBookmarkClient to bookmarks code

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/bookmarks/bookmark_drag_drop.cc

Issue 1203713002: Limit access to ChromeBookmarkClient to bookmarks code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_bookmark_client

Patch Set: Rebase Created 5 years, 6 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/bookmarks/bookmark_context_menu_controller.cc ('k') | chrome/browser/ui/bookmarks/bookmark_utils.cc » ('j') | components/bookmarks/browser/bookmark_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/bookmarks/bookmark_drag_drop.cc

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

index 1740a3bf016c8c2d289abcf2096219d04c1a32a0..def56f7829d45367763c8a7dcb9b44f612974312 100644

--- a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc

+++ b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc

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

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

#include "chrome/browser/profiles/profile.h"

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

-#include "components/bookmarks/browser/bookmark_client.h"

#include "components/bookmarks/browser/bookmark_model.h"

#include "components/bookmarks/browser/bookmark_node_data.h"

#include "components/bookmarks/browser/bookmark_utils.h"

@@ -33,9 +32,8 @@ int DropBookmarks(Profile* profile,

if (data.IsFromProfilePath(profile->GetPath())) {

const std::vector<const BookmarkNode*> dragged_nodes =

data.GetNodes(model, profile->GetPath());

- DCHECK(model->client()->CanBeEditedByUser(parent_node));

- DCHECK(copy ||

- bookmarks::CanAllBeEditedByUser(model->client(), dragged_nodes));

+ DCHECK(model->CanBeEditedByUser(parent_node));

+ DCHECK(copy || bookmarks::CanAllBeEditedByUser(model, dragged_nodes));

if (!dragged_nodes.empty()) {

// Drag from same profile. Copy or move nodes.

for (size_t i = 0; i < dragged_nodes.size(); ++i) {