diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 21:54:14 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 21:54:14 +0000 |
| commit | bd1b96700fa45143e04bd8d07a0a519d6962f4a6 (patch) | |
| tree | 73ed252babadbeb0e1550581e23d29c7a65f701e /chrome/browser/importer | |
| parent | 7c51b0ee951bf8ed70d0ed6506567991c611d070 (diff) | |
| download | chromium_src-bd1b96700fa45143e04bd8d07a0a519d6962f4a6.zip chromium_src-bd1b96700fa45143e04bd8d07a0a519d6962f4a6.tar.gz chromium_src-bd1b96700fa45143e04bd8d07a0a519d6962f4a6.tar.bz2 | |
Lands http://codereview.chromium.org/155128 for Thiago.
Description from Thiago:
Converting the history::StarredEntry::Type to a type defined in BookmarkNode.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/155165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/importer.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 0d9788a..b9f4600 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -123,8 +123,8 @@ void ProfileWriter::AddBookmarkEntry( for (int index = 0; index < parent->GetChildCount(); ++index) { const BookmarkNode* node = parent->GetChild(index); - if ((node->GetType() == history::StarredEntry::BOOKMARK_BAR || - node->GetType() == history::StarredEntry::USER_GROUP) && + if ((node->GetType() == BookmarkNode::BOOKMARK_BAR || + node->GetType() == BookmarkNode::FOLDER) && node->GetTitle() == folder_name) { child = node; break; @@ -301,7 +301,8 @@ std::wstring ProfileWriter::GenerateUniqueFolderName( // Build a set containing the folder names of the other folder. std::set<std::wstring> other_folder_names; const BookmarkNode* other = model->other_node(); - for (int i = 0; i < other->GetChildCount(); ++i) { + + for (int i = 0, child_count = other->GetChildCount(); i < child_count; ++i) { const BookmarkNode* node = other->GetChild(i); if (node->is_folder()) other_folder_names.insert(node->GetTitle()); |