Skip to content

Commit

Permalink
Remove unused bookmarkManagerPrivate APIs.
Browse files Browse the repository at this point in the history 
Bug: 938695
Change-Id: I7c67ffb827e483a253d92ad98d90e7e02a5c1d63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1507295
Auto-Submit: calamity <[email protected]>
Reviewed-by: Ben Wells <[email protected]>
Commit-Queue: calamity <[email protected]>
Cr-Commit-Position: refs/heads/master@{#638550}
  • Loading branch information
@nik3daz
nik3daz authored and Commit Bot committed Mar 7, 2019
1 parent 9a5a427 commit f97721a
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 773 deletions.
250 changes: 0 additions & 250 deletions chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,14 @@ namespace extensions {

namespace bookmark_keys = bookmark_api_constants;
namespace bookmark_manager_private = api::bookmark_manager_private;
namespace CanPaste = api::bookmark_manager_private::CanPaste;
namespace Copy = api::bookmark_manager_private::Copy;
namespace CreateWithMetaInfo =
api::bookmark_manager_private::CreateWithMetaInfo;
namespace Cut = api::bookmark_manager_private::Cut;
namespace Drop = api::bookmark_manager_private::Drop;
namespace GetSubtree = api::bookmark_manager_private::GetSubtree;
namespace GetMetaInfo = api::bookmark_manager_private::GetMetaInfo;
namespace Paste = api::bookmark_manager_private::Paste;
namespace RedoInfo = api::bookmark_manager_private::GetRedoInfo;
namespace RemoveTrees = api::bookmark_manager_private::RemoveTrees;
namespace SetMetaInfo = api::bookmark_manager_private::SetMetaInfo;
namespace SortChildren = api::bookmark_manager_private::SortChildren;
namespace StartDrag = api::bookmark_manager_private::StartDrag;
namespace UndoInfo = api::bookmark_manager_private::GetUndoInfo;
namespace UpdateMetaInfo = api::bookmark_manager_private::UpdateMetaInfo;

namespace {

Expand Down Expand Up @@ -200,58 +192,9 @@ void BookmarkManagerPrivateEventRouter::BookmarkModelBeingDeleted(
bookmark_model_ = NULL;
}

void BookmarkManagerPrivateEventRouter::OnWillChangeBookmarkMetaInfo(
BookmarkModel* model,
const BookmarkNode* node) {
DCHECK(prev_meta_info_.empty());
if (node->GetMetaInfoMap())
prev_meta_info_ = *node->GetMetaInfoMap();
}

void BookmarkManagerPrivateEventRouter::BookmarkMetaInfoChanged(
BookmarkModel* model,
const BookmarkNode* node) {
const BookmarkNode::MetaInfoMap* new_meta_info = node->GetMetaInfoMap();
bookmark_manager_private::MetaInfoFields changes;

// Identify changed/removed fields:
for (BookmarkNode::MetaInfoMap::const_iterator it = prev_meta_info_.begin();
it != prev_meta_info_.end();
++it) {
if (!new_meta_info) {
changes.additional_properties[it->first] = "";
} else {
auto new_meta_field = new_meta_info->find(it->first);
if (new_meta_field == new_meta_info->end()) {
changes.additional_properties[it->first] = "";
} else if (it->second != new_meta_field->second) {
changes.additional_properties[it->first] = new_meta_field->second;
}
}
}

// Identify added fields:
if (new_meta_info) {
for (auto it = new_meta_info->cbegin(); it != new_meta_info->cend(); ++it) {
auto prev_meta_field = prev_meta_info_.find(it->first);
if (prev_meta_field == prev_meta_info_.end())
changes.additional_properties[it->first] = it->second;
}
}

prev_meta_info_.clear();
DispatchEvent(events::BOOKMARK_MANAGER_PRIVATE_ON_META_INFO_CHANGED,
bookmark_manager_private::OnMetaInfoChanged::kEventName,
bookmark_manager_private::OnMetaInfoChanged::Create(
base::NumberToString(node->id()), changes));
}

BookmarkManagerPrivateAPI::BookmarkManagerPrivateAPI(
content::BrowserContext* browser_context)
: browser_context_(browser_context) {
EventRouter* event_router = EventRouter::Get(browser_context);
event_router->RegisterObserver(
this, bookmark_manager_private::OnMetaInfoChanged::kEventName);
}

BookmarkManagerPrivateAPI::~BookmarkManagerPrivateAPI() {}
Expand Down Expand Up @@ -424,28 +367,6 @@ bool BookmarkManagerPrivatePasteFunction::RunOnReady() {
return true;
}

bool BookmarkManagerPrivateCanPasteFunction::RunOnReady() {
std::unique_ptr<CanPaste::Params> params(CanPaste::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);

PrefService* prefs = user_prefs::UserPrefs::Get(GetProfile());
if (!prefs->GetBoolean(bookmarks::prefs::kEditBookmarksEnabled)) {
SetResult(std::make_unique<base::Value>(false));
return true;
}

BookmarkModel* model =
BookmarkModelFactory::GetForBrowserContext(GetProfile());
const BookmarkNode* parent_node = GetNodeFromString(model, params->parent_id);
if (!parent_node) {
error_ = bookmark_keys::kNoParentError;
return false;
}
bool can_paste = bookmarks::CanPasteFromClipboard(model, parent_node);
SetResult(std::make_unique<base::Value>(can_paste));
return true;
}

bool BookmarkManagerPrivateSortChildrenFunction::RunOnReady() {
if (!EditBookmarksEnabled())
return false;
Expand Down Expand Up @@ -568,153 +489,6 @@ bool BookmarkManagerPrivateGetSubtreeFunction::RunOnReady() {
return true;
}

bool BookmarkManagerPrivateCanEditFunction::RunOnReady() {
PrefService* prefs = user_prefs::UserPrefs::Get(GetProfile());
SetResult(std::make_unique<base::Value>(
prefs->GetBoolean(bookmarks::prefs::kEditBookmarksEnabled)));
return true;
}

bool BookmarkManagerPrivateRecordLaunchFunction::RunOnReady() {
RecordBookmarkLaunch(NULL, BOOKMARK_LAUNCH_LOCATION_MANAGER);
return true;
}

bool BookmarkManagerPrivateCreateWithMetaInfoFunction::RunOnReady() {
if (!EditBookmarksEnabled())
return false;

std::unique_ptr<CreateWithMetaInfo::Params> params(
CreateWithMetaInfo::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);

BookmarkModel* model =
BookmarkModelFactory::GetForBrowserContext(GetProfile());
const BookmarkNode* node = CreateBookmarkNode(
model, params->bookmark, &params->meta_info.additional_properties);
if (!node)
return false;

api::bookmarks::BookmarkTreeNode result_node =
bookmark_api_helpers::GetBookmarkTreeNode(GetManagedBookmarkService(),
node, false, false);
results_ = CreateWithMetaInfo::Results::Create(result_node);

return true;
}

bool BookmarkManagerPrivateGetMetaInfoFunction::RunOnReady() {
std::unique_ptr<GetMetaInfo::Params> params(
GetMetaInfo::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);

if (params->id) {
const BookmarkNode* node = GetBookmarkNodeFromId(*params->id);
if (!node)
return false;

if (params->key) {
std::string value;
if (node->GetMetaInfo(*params->key, &value)) {
GetMetaInfo::Results::Value result;
result.as_string.reset(new std::string(value));
results_ = GetMetaInfo::Results::Create(result);
}
} else {
GetMetaInfo::Results::Value result;
result.as_object.reset(new GetMetaInfo::Results::Value::Object);

const BookmarkNode::MetaInfoMap* meta_info = node->GetMetaInfoMap();
if (meta_info) {
BookmarkNode::MetaInfoMap::const_iterator itr;
base::DictionaryValue& temp = result.as_object->additional_properties;
for (itr = meta_info->begin(); itr != meta_info->end(); itr++) {
temp.SetKey(itr->first, base::Value(itr->second));
}
}
results_ = GetMetaInfo::Results::Create(result);
}
} else {
if (params->key) {
error_ = bookmark_api_constants::kInvalidParamError;
return true;
}

BookmarkModel* model =
BookmarkModelFactory::GetForBrowserContext(GetProfile());
const BookmarkNode* node = model->root_node();

GetMetaInfo::Results::Value result;
result.as_object.reset(new GetMetaInfo::Results::Value::Object);

bookmark_api_helpers::GetMetaInfo(*node,
&result.as_object->additional_properties);

results_ = GetMetaInfo::Results::Create(result);
}

return true;
}

bool BookmarkManagerPrivateSetMetaInfoFunction::RunOnReady() {
if (!EditBookmarksEnabled())
return false;

std::unique_ptr<SetMetaInfo::Params> params(
SetMetaInfo::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);

const BookmarkNode* node = GetBookmarkNodeFromId(params->id);
if (!node)
return false;

if (!CanBeModified(node))
return false;

BookmarkModel* model =
BookmarkModelFactory::GetForBrowserContext(GetProfile());
if (model->is_permanent_node(node)) {
error_ = bookmark_keys::kModifySpecialError;
return false;
}

model->SetNodeMetaInfo(node, params->key, params->value);
return true;
}

bool BookmarkManagerPrivateUpdateMetaInfoFunction::RunOnReady() {
if (!EditBookmarksEnabled())
return false;

std::unique_ptr<UpdateMetaInfo::Params> params(
UpdateMetaInfo::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);

const BookmarkNode* node = GetBookmarkNodeFromId(params->id);
if (!node)
return false;

if (!CanBeModified(node))
return false;

BookmarkModel* model =
BookmarkModelFactory::GetForBrowserContext(GetProfile());
if (model->is_permanent_node(node)) {
error_ = bookmark_keys::kModifySpecialError;
return false;
}

BookmarkNode::MetaInfoMap new_meta_info(
params->meta_info_changes.additional_properties);
if (node->GetMetaInfoMap()) {
new_meta_info.insert(node->GetMetaInfoMap()->begin(),
node->GetMetaInfoMap()->end());
}
model->SetNodeMetaInfoMap(node, new_meta_info);

return true;
}

bool BookmarkManagerPrivateRemoveTreesFunction::RunOnReady() {
if (!EditBookmarksEnabled())
return false;
Expand Down Expand Up @@ -755,30 +529,6 @@ bool BookmarkManagerPrivateRedoFunction::RunOnReady() {
return true;
}

bool BookmarkManagerPrivateGetUndoInfoFunction::RunOnReady() {
UndoManager* undo_manager =
BookmarkUndoServiceFactory::GetForProfile(GetProfile())->undo_manager();

UndoInfo::Results::Result result;
result.enabled = undo_manager->undo_count() > 0;
result.label = base::UTF16ToUTF8(undo_manager->GetUndoLabel());

results_ = UndoInfo::Results::Create(result);
return true;
}

bool BookmarkManagerPrivateGetRedoInfoFunction::RunOnReady() {
UndoManager* undo_manager =
BookmarkUndoServiceFactory::GetForProfile(GetProfile())->undo_manager();

RedoInfo::Results::Result result;
result.enabled = undo_manager->redo_count() > 0;
result.label = base::UTF16ToUTF8(undo_manager->GetRedoLabel());

results_ = RedoInfo::Results::Create(result);
return true;
}

WEB_CONTENTS_USER_DATA_KEY_IMPL(BookmarkManagerPrivateDragEventRouter)

} // namespace extensions
Loading

0 comments on commit f97721a

Please sign in to comment.