bookmarks: Move BookmarkNode into 'bookmarks' namespace.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 53 matching lines @@
         : ui::TreeNodeModel<EditorNode>(root) {}
 
     void SetTitle(ui::TreeModelNode* node,
                   const base::string16& title) override;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(EditorTreeModel);
   };
 
   BookmarkEditorView(Profile* profile,
-                     const BookmarkNode* parent,
+                     const bookmarks::BookmarkNode* parent,
                      const EditDetails& details,
                      BookmarkEditor::Configuration configuration);
 
   ~BookmarkEditorView() override;
 
   // views::DialogDelegateView:
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
   bool IsDialogButtonEnabled(ui::DialogButton button) const override;
   views::View* CreateExtraView() override;
   ui::ModalType GetModalType() const override;
@@ skipping 38 matching lines @@
   friend class BookmarkEditorViewTest;
 
   // views::DialogDelegateView:
   const char* GetClassName() const override;
 
   // bookmarks::BookmarkModelObserver:
   // Any structural change results in resetting the tree model.
   void BookmarkModelLoaded(bookmarks::BookmarkModel* model,
                            bool ids_reassigned) override {}
   void BookmarkNodeMoved(bookmarks::BookmarkModel* model,
-                         const BookmarkNode* old_parent,
+                         const bookmarks::BookmarkNode* old_parent,
                          int old_index,
-                         const BookmarkNode* new_parent,
+                         const bookmarks::BookmarkNode* new_parent,
                          int new_index) override;
   void BookmarkNodeAdded(bookmarks::BookmarkModel* model,
-                         const BookmarkNode* parent,
+                         const bookmarks::BookmarkNode* parent,
                          int index) override;
   void BookmarkNodeRemoved(bookmarks::BookmarkModel* model,
-                           const BookmarkNode* parent,
+                           const bookmarks::BookmarkNode* parent,
                            int index,
-                           const BookmarkNode* node,
+                           const bookmarks::BookmarkNode* node,
                            const std::set<GURL>& removed_urls) override;
   void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model,
                                    const std::set<GURL>& removed_urls) override;
   void BookmarkNodeChanged(bookmarks::BookmarkModel* model,
-                           const BookmarkNode* node) override {}
-  void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model,
-                                     const BookmarkNode* node) override;
-  void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model,
-                                  const BookmarkNode* node) override {}
+                           const bookmarks::BookmarkNode* node) override {}
+  void BookmarkNodeChildrenReordered(
+      bookmarks::BookmarkModel* model,
+      const bookmarks::BookmarkNode* node) override;
+  void BookmarkNodeFaviconChanged(
+      bookmarks::BookmarkModel* model,
+      const bookmarks::BookmarkNode* node) override {}
 
   // Creates the necessary sub-views, configures them, adds them to the layout,
   // and requests the entries to display from the database.
   void Init();
 
   // Resets the model of the tree and updates the various buttons appropriately.
   void Reset();
 
   // Expands all the nodes in the tree and selects the parent node of the
   // url we're editing or the most recent parent if the url being editted isn't
   // starred.
   void ExpandAndSelect();
 
   // Creates a returns the new root node. This invokes CreateNodes to do
   // the real work.
   EditorNode* CreateRootNode();
 
   // Adds and creates a child node in b_node for all children of bb_node that
   // are folders.
-  void CreateNodes(const BookmarkNode* bb_node, EditorNode* b_node);
+  void CreateNodes(const bookmarks::BookmarkNode* bb_node, EditorNode* b_node);
 
   // Returns the node with the specified id, or NULL if one can't be found.
   EditorNode* FindNodeWithID(BookmarkEditorView::EditorNode* node, int64 id);
 
   // Invokes ApplyEdits with the selected node.
   void ApplyEdits();
 
   // Applies the edits done by the user. |parent| gives the parent of the URL
   // being edited.
   void ApplyEdits(EditorNode* parent);
 
   // Recursively adds newly created folders and sets the title of nodes to
   // match the user edited title.
   //
   // bb_node gives the BookmarkNode the edits are to be applied to, with b_node
   // the source of the edits.
   //
   // If b_node == parent_b_node, parent_bb_node is set to bb_node. This is
   // used to determine the new BookmarkNode parent based on the EditorNode
   // parent.
   void ApplyNameChangesAndCreateNewFolders(
-      const BookmarkNode* bb_node,
+      const bookmarks::BookmarkNode* bb_node,
       BookmarkEditorView::EditorNode* b_node,
       BookmarkEditorView::EditorNode* parent_b_node,
-      const BookmarkNode** parent_bb_node);
+      const bookmarks::BookmarkNode** parent_bb_node);
 
   // Returns the current url the user has input.
   GURL GetInputURL() const;
 
   // Invoked when the url or title has possibly changed. Updates the background
   // of Textfields and ok button appropriately.
   void UserInputChanged();
 
   // Creates a new folder as a child of the selected node. If no node is
   // selected, the new folder is added as a child of the bookmark node. Starts
@@ skipping 32 matching lines @@
   views::Textfield* url_tf_;
 
   // The label for the title text field.
   views::Label* title_label_;
 
   // The text field used for editing the title.
   views::Textfield* title_tf_;
 
   // Initial parent to select. Is only used if |details_.existing_node| is
   // NULL.
-  const BookmarkNode* parent_;
+  const bookmarks::BookmarkNode* parent_;
 
   const EditDetails details_;
 
   // The context menu.
   scoped_ptr<ui::SimpleMenuModel> context_menu_model_;
   scoped_ptr<views::MenuRunner> context_menu_runner_;
 
   // Mode used to create nodes from.
   bookmarks::BookmarkModel* bb_model_;
 
   // If true, we're running the menu for the bookmark bar or other bookmarks
   // nodes.
   bool running_menu_for_root_;
 
   // Is the tree shown?
   bool show_tree_;
 
   // List of deleted bookmark folders.
   std::vector<int64> deletes_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditorView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_