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

Unified Diff: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc

Issue 302313005: Show the Managed Bookmarks folder in the views UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased on model changes Created 6 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
Index: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
index 4b10bcc3b6b45db48a4541027816a11f9f434a1e..b6e4c02b42c5f53fdff52f0e695797296822630c 100644
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@ -389,7 +389,7 @@ bool BookmarkManagerPrivatePasteFunction::RunOnReady() {
const BookmarkNode* parent_node = GetNodeFromString(model, params->parent_id);
if (!CanBeModified(parent_node))
return false;
- bool can_paste = bookmark_utils::CanPasteFromClipboard(parent_node);
+ bool can_paste = bookmark_utils::CanPasteFromClipboard(model, parent_node);
if (!can_paste)
return false;
@@ -417,15 +417,14 @@ bool BookmarkManagerPrivateCanPasteFunction::RunOnReady() {
scoped_ptr<CanPaste::Params> params(CanPaste::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);
- ChromeBookmarkClient* client = GetChromeBookmarkClient();
- const BookmarkNode* parent_node =
- GetNodeFromString(client->model(), params->parent_id);
+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
+ const BookmarkNode* parent_node = GetNodeFromString(model, params->parent_id);
if (!parent_node) {
error_ = bookmark_keys::kNoParentError;
return false;
}
- bool can_paste = bookmark_utils::CanPasteFromClipboard(parent_node) &&
- !client->IsDescendantOfManagedNode(parent_node);
+ bool can_paste =
+ bookmark_utils::CanPasteFromClipboard(model, parent_node);
SetResult(new base::FundamentalValue(can_paste));
return true;
}
@@ -595,7 +594,9 @@ bool BookmarkManagerPrivateDropFunction::RunOnReady() {
NOTREACHED() <<"Somehow we're dropping null bookmark data";
return false;
}
- chrome::DropBookmarks(GetProfile(), *drag_data, drop_parent, drop_index);
+ const bool copy = false;
+ chrome::DropBookmarks(
+ GetProfile(), *drag_data, drop_parent, drop_index, copy);
router->ClearBookmarkNodeData();
return true;

Powered by Google App Engine
This is Rietveld 408576698