Style cleanup in bookmarks import code

chrome/browser/importer/profile_writer.cc

 // Copyright (c) 2011 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/importer/profile_writer.h"
 
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 42 matching lines @@
 
   PrefService* prefs = profile_->GetPrefs();
   // NOTE: We set the kHomePage value, but keep the NewTab page as the homepage.
   const PrefService::Preference* pref = prefs->FindPreference(prefs::kHomePage);
   if (pref && !pref->IsManaged()) {
     prefs->SetString(prefs::kHomePage, home_page.spec());
     prefs->ScheduleSavePersistentPrefs();
   }
 }
 
-void ProfileWriter::AddBookmarkEntry(
-    const std::vector<BookmarkEntry>& bookmark,
-    const string16& first_folder_name,
-    int options) {
+void ProfileWriter::AddBookmarks(const std::vector<BookmarkEntry>& bookmarks,
+                                 const string16& first_folder_name,
+                                 int options) {
+  if (bookmarks.empty())
+    return;
+
   BookmarkModel* model = profile_->GetBookmarkModel();
   DCHECK(model->IsLoaded());
 
   bool import_to_bookmark_bar = ((options & IMPORT_TO_BOOKMARK_BAR) != 0);
   string16 real_first_folder = import_to_bookmark_bar ? first_folder_name :
       GenerateUniqueFolderName(model, first_folder_name);
 
   bool show_bookmark_toolbar = false;
   std::set<const BookmarkNode*> folders_added_to;
-  bool import_mode = false;
-  if (bookmark.size() > 1) {
-    model->BeginImportMode();
-    import_mode = true;
-  }
-  for (std::vector<BookmarkEntry>::const_iterator it = bookmark.begin();
-       it != bookmark.end(); ++it) {
+
+  model->BeginImportMode();
+
+  for (std::vector<BookmarkEntry>::const_iterator it = bookmarks.begin();
+       it != bookmarks.end(); ++it) {
     // Don't insert this url if it isn't valid.
     if (!it->is_folder && !it->url.is_valid())
       continue;
 
     // We suppose that bookmarks are unique by Title, URL, and Folder.  Since
     // checking for uniqueness may not be always the user's intention we have
     // this as an option.
     if (options & ADD_IF_UNIQUE && DoesBookmarkExist(model, *it,
         real_first_folder, import_to_bookmark_bar))
       continue;
 
     // Set up folders in BookmarkModel in such a way that path[i] is
     // the subfolder of path[i-1]. Finally they construct a path in the
     // model:
     //   path[0] \ path[1] \ ... \ path[size() - 1]
     const BookmarkNode* parent =
         (it->in_toolbar ? model->GetBookmarkBarNode() : model->other_node());
     for (std::vector<string16>::const_iterator i = it->path.begin();
          i != it->path.end(); ++i) {
       const BookmarkNode* child = NULL;
       const string16& folder_name = (!import_to_bookmark_bar &&
           !it->in_toolbar && (i == it->path.begin())) ? real_first_folder : *i;
 
       for (int index = 0; index < parent->child_count(); ++index) {
         const BookmarkNode* node = parent->GetChild(index);
-        if ((node->type() == BookmarkNode::BOOKMARK_BAR ||
-             node->type() == BookmarkNode::FOLDER) &&
-            node->GetTitle() == folder_name) {
+        if (node->is_folder() && node->GetTitle() == folder_name) {
           child = node;
           break;
         }
       }
-      if (child == NULL)
+      if (!child)
         child = model->AddFolder(parent, parent->child_count(), folder_name);
       parent = child;
     }
+
     folders_added_to.insert(parent);
     if (it->is_folder) {
       model->AddFolder(parent, parent->child_count(), it->title);
     } else {
       model->AddURLWithCreationTime(parent, parent->child_count(),
           it->title, it->url, it->creation_time);
     }
 
     // If some items are put into toolbar, it looks like the user was using
     // it in their last browser. We turn on the bookmarks toolbar.
     if (it->in_toolbar)
       show_bookmark_toolbar = true;
   }
 
-  // Reset the date modified time of the folders we added to. We do this to
-  // make sure the 'recently added to' combobox in the bubble doesn't get random
-  // folders.
+  // In order to avoid the imported-to folders from appearing in the 'recently

[Miranda Callahan, 2011/05/21 11:34:21]

nit: s/avoid/keep

[Ilya Sherman, 2011/05/24 06:01:13]

Done.

+  // added to' combobox, reset their modified times.
   for (std::set<const BookmarkNode*>::const_iterator i =
-          folders_added_to.begin();
+           folders_added_to.begin();
        i != folders_added_to.end(); ++i) {
     model->ResetDateFolderModified(*i);
   }
 
-  if (import_mode) {
-    model->EndImportMode();
-  }
+  model->EndImportMode();
 
   if (show_bookmark_toolbar && !(options & BOOKMARK_BAR_DISABLED))
     ShowBookmarkBar();
 }
 
 void ProfileWriter::AddFavicons(
     const std::vector<history::ImportedFaviconUsage>& favicons) {
   profile_->GetFaviconService(Profile::EXPLICIT_ACCESS)->
       SetImportedFavicons(favicons);
 }
@@ skipping 198 matching lines @@
          ((!import_to_bookmark_bar || !entry.in_toolbar) &&
            parent != model->other_node()))) {
       found_match = false;
     }
 
     if (found_match)
       return true;  // Found a match with the same url path and title.
   }
   return false;
 }