Move bookmark_utils into bookmarks namespace.

chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 194 matching lines @@
 
 void BookmarkEditorView::ExecuteCommand(int command_id, int event_flags) {
   DCHECK(tree_view_->GetSelectedNode());
   if (command_id == IDS_EDIT) {
     tree_view_->StartEditing(tree_view_->GetSelectedNode());
   } else if (command_id == IDS_DELETE) {
     EditorNode* node = tree_model_->AsNode(tree_view_->GetSelectedNode());
     if (!node)
       return;
     if (node->value != 0) {
-      const BookmarkNode* b_node = GetBookmarkNodeByID(bb_model_, node->value);
+      const BookmarkNode* b_node =
+          bookmarks::GetBookmarkNodeByID(bb_model_, node->value);
       if (!b_node->empty() &&
           !chrome::ConfirmDeleteBookmarkNode(b_node,
             GetWidget()->GetNativeWindow())) {
         // The folder is not empty and the user didn't confirm.
         return;
       }
       deletes_.push_back(node->value);
     }
     tree_model_->Remove(node->parent(), node);
   } else {
@@ skipping 344 matching lines @@
 
   BookmarkEditor::ApplyEditsWithPossibleFolderChange(
       bb_model_, new_parent, details_, new_title, new_url);
 
   BookmarkExpandedStateTracker::Nodes expanded_nodes;
   UpdateExpandedNodes(tree_model_->GetRoot(), &expanded_nodes);
   bb_model_->expanded_state_tracker()->SetExpandedNodes(expanded_nodes);
 
   // Remove the folders that were removed. This has to be done after all the
   // other changes have been committed.
-  bookmark_utils::DeleteBookmarkFolders(bb_model_, deletes_);
+  bookmarks::DeleteBookmarkFolders(bb_model_, deletes_);
 }
 
 void BookmarkEditorView::ApplyNameChangesAndCreateNewFolders(
     const BookmarkNode* bb_node,
     BookmarkEditorView::EditorNode* b_node,
     BookmarkEditorView::EditorNode* parent_b_node,
     const BookmarkNode** parent_bb_node) {
   if (parent_b_node == b_node)
     *parent_bb_node = bb_node;
   for (int i = 0; i < b_node->child_count(); ++i) {
@@ skipping 21 matching lines @@
                                         parent_b_node, parent_bb_node);
   }
 }
 
 void BookmarkEditorView::UpdateExpandedNodes(
     EditorNode* editor_node,
     BookmarkExpandedStateTracker::Nodes* expanded_nodes) {
   if (!tree_view_->IsExpanded(editor_node))
     return;
 
-  if (editor_node->value != 0)  // The root is 0.
-    expanded_nodes->insert(GetBookmarkNodeByID(bb_model_, editor_node->value));
+  // The root is 0.
+  if (editor_node->value != 0) {
+    expanded_nodes->insert(
+        bookmarks::GetBookmarkNodeByID(bb_model_, editor_node->value));
+  }
 
   for (int i = 0; i < editor_node->child_count(); ++i)
     UpdateExpandedNodes(editor_node->GetChild(i), expanded_nodes);
 }
 
 ui::SimpleMenuModel* BookmarkEditorView::GetMenuModel() {
   if (!context_menu_model_.get()) {
     context_menu_model_.reset(new ui::SimpleMenuModel(this));
     context_menu_model_->AddItemWithStringId(IDS_EDIT, IDS_EDIT);
     context_menu_model_->AddItemWithStringId(IDS_DELETE, IDS_DELETE);
     context_menu_model_->AddItemWithStringId(
         IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM,
         IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
   }
   return context_menu_model_.get();
 }
 
 void BookmarkEditorView::EditorTreeModel::SetTitle(
     ui::TreeModelNode* node,
     const base::string16& title) {
   if (!title.empty())
     ui::TreeNodeModel<EditorNode>::SetTitle(node, title);
 }