Renames BoomarkBarModel to BookmarkModel.

chrome/browser/bookmarks/bookmark_drag_data.cc

 // Copyright (c) 2006-2008 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/bookmarks/bookmark_drag_data.h"
 
 #include "base/pickle.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/common/os_exchange_data.h"
 
 static CLIPFORMAT clipboard_format = 0;
 
 static void RegisterFormat() {
   if (clipboard_format == 0) {
     clipboard_format = RegisterClipboardFormat(L"chrome/x-bookmark-entry");
     DCHECK(clipboard_format);
   }
 }
 
 BookmarkDragData::BookmarkDragData() : is_url(false), is_valid(false) {
 }
 
-BookmarkDragData::BookmarkDragData(BookmarkBarNode* node)
+BookmarkDragData::BookmarkDragData(BookmarkNode* node)
     : is_url(node->GetType() == history::StarredEntry::URL),
       url(node->GetURL()),
       title(node->GetTitle()),
       is_valid(true),
       id_(node->id()) {
   if (!is_url)
     AddChildren(node);
 }
 
 void BookmarkDragData::Write(OSExchangeData* data) const {
@@ skipping 21 matching lines @@
     if (data.GetPickledData(clipboard_format, &drag_data_pickle)) {
       void* data_iterator = NULL;
       if (ReadFromPickle(&drag_data_pickle, &data_iterator)) {
         is_valid = true;
       }
     }
   }
   return is_valid;
 }
 
-BookmarkBarNode* BookmarkDragData::GetNode(BookmarkBarModel* model) const {
+BookmarkNode* BookmarkDragData::GetNode(BookmarkModel* model) const {
   DCHECK(!is_url && id_ && is_valid);
   return model->GetNodeByID(id_);
 }
 
 void BookmarkDragData::WriteToPickle(Pickle* pickle) const {
   pickle->WriteBool(is_url);
   pickle->WriteWString(profile_id);
   pickle->WriteString(url.spec());
   pickle->WriteWString(title);
   if (!is_url) {
@@ skipping 28 matching lines @@
     for (std::vector<BookmarkDragData>::iterator i = children.begin();
          i != children.end(); ++i) {
       if (!i->ReadFromPickle(pickle, iterator))
         return false;
     }
   }
   is_valid = true;
   return true;
 }
 
-void BookmarkDragData::AddChildren(BookmarkBarNode* node) {
+void BookmarkDragData::AddChildren(BookmarkNode* node) {
   for (int i = 0, max = node->GetChildCount(); i < max; ++i)
     children.push_back(BookmarkDragData(node->GetChild(i)));
 }