Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / undo / bookmark_undo_service.cc

diff --git a/src/chrome/browser/undo/bookmark_undo_service.cc b/src/chrome/browser/undo/bookmark_undo_service.cc
index e47158d..b010d14 100644 (file)
--- a/src/chrome/browser/undo/bookmark_undo_service.cc
+++ b/src/chrome/browser/undo/bookmark_undo_service.cc
@@ -14,7 +14,8 @@
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
 #include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
+
+using bookmarks::BookmarkNodeData;
 
 namespace {
 
@@ -81,7 +82,8 @@ BookmarkAddOperation::BookmarkAddOperation(Profile* profile,
 
 void BookmarkAddOperation::Undo() {
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* parent = GetBookmarkNodeByID(model, parent_id_);
+  const BookmarkNode* parent =
+      bookmarks::GetBookmarkNodeByID(model, parent_id_);
   DCHECK(parent);
 
   model->Remove(parent, index_);
@@ -147,11 +149,12 @@ BookmarkRemoveOperation::BookmarkRemoveOperation(Profile* profile,
 void BookmarkRemoveOperation::Undo() {
   DCHECK(removed_node_.is_valid());
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* parent = GetBookmarkNodeByID(model, parent_id_);
+  const BookmarkNode* parent =
+      bookmarks::GetBookmarkNodeByID(model, parent_id_);
   DCHECK(parent);
 
-  bookmark_utils::CloneBookmarkNode(model, removed_node_.elements, parent,
-                                    old_index_, false);
+  bookmarks::CloneBookmarkNode(
+      model, removed_node_.elements, parent, old_index_, false);
   UpdateBookmarkIds(removed_node_.elements[0], parent, old_index_);
 }
 
@@ -215,7 +218,7 @@ BookmarkEditOperation::BookmarkEditOperation(Profile* profile,
 void BookmarkEditOperation::Undo() {
   DCHECK(original_bookmark_.is_valid());
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* node = GetBookmarkNodeByID(model, node_id_);
+  const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, node_id_);
   DCHECK(node);
 
   model->SetTitle(node, original_bookmark_.elements[0].title);
@@ -279,8 +282,10 @@ BookmarkMoveOperation::BookmarkMoveOperation(Profile* profile,
 
 void BookmarkMoveOperation::Undo() {
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* old_parent = GetBookmarkNodeByID(model, old_parent_id_);
-  const BookmarkNode* new_parent = GetBookmarkNodeByID(model, new_parent_id_);
+  const BookmarkNode* old_parent =
+      bookmarks::GetBookmarkNodeByID(model, old_parent_id_);
+  const BookmarkNode* new_parent =
+      bookmarks::GetBookmarkNodeByID(model, new_parent_id_);
   DCHECK(old_parent);
   DCHECK(new_parent);
 
@@ -352,12 +357,15 @@ BookmarkReorderOperation::~BookmarkReorderOperation() {
 
 void BookmarkReorderOperation::Undo() {
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* parent = GetBookmarkNodeByID(model, parent_id_);
+  const BookmarkNode* parent =
+      bookmarks::GetBookmarkNodeByID(model, parent_id_);
   DCHECK(parent);
 
   std::vector<const BookmarkNode*> ordered_nodes;
-  for (size_t i = 0; i < ordered_bookmarks_.size(); ++i)
-    ordered_nodes.push_back(GetBookmarkNodeByID(model, ordered_bookmarks_[i]));
+  for (size_t i = 0; i < ordered_bookmarks_.size(); ++i) {
+    ordered_nodes.push_back(
+        bookmarks::GetBookmarkNodeByID(model, ordered_bookmarks_[i]));
+  }
 
   model->ReorderChildren(parent, ordered_nodes);
 }