bookmarks: Rename entries with GroupModified to FolderModified.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/6673014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77905 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 23 insertions, 22 deletions

diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 716af38..6c5ad73 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -191,7 +191,7 @@ void BookmarkModel::Move(const BookmarkNode* node,
     return;
   }
 
-  SetDateGroupModified(new_parent, Time::Now());
+  SetDateFolderModified(new_parent, Time::Now());
 
   const BookmarkNode* old_parent = node->parent();
   int old_index = old_parent->GetIndexOf(node);
@@ -230,7 +230,7 @@ void BookmarkModel::Copy(const BookmarkNode* node,
     return;
   }
 
-  SetDateGroupModified(new_parent, Time::Now());
+  SetDateFolderModified(new_parent, Time::Now());
   BookmarkNodeData drag_data_(node);
   std::vector<BookmarkNodeData::Element> elements(drag_data_.elements);
   // CloneBookmarkNode will use BookmarkModel methods to do the job, so we
@@ -410,7 +410,7 @@ const BookmarkNode* BookmarkModel::AddURLWithCreationTime(
 
   bool was_bookmarked = IsBookmarked(url);
 
-  SetDateGroupModified(parent, creation_time);
+  SetDateFolderModified(parent, creation_time);
 
   BookmarkNode* new_node = new BookmarkNode(generate_next_node_id(), url);
   new_node->set_title(title);
@@ -475,8 +475,8 @@ void BookmarkModel::SetURLStarred(const GURL& url,
   }
 }
 
-void BookmarkModel::SetDateGroupModified(const BookmarkNode* parent,
-                                         const Time time) {
+void BookmarkModel::SetDateFolderModified(const BookmarkNode* parent,
+                                          const Time time) {
   DCHECK(parent);
   AsMutable(parent)->set_date_folder_modified(time);
 
@@ -484,8 +484,8 @@ void BookmarkModel::SetDateGroupModified(const BookmarkNode* parent,
     store_->ScheduleSave();
 }
 
-void BookmarkModel::ResetDateGroupModified(const BookmarkNode* node) {
-  SetDateGroupModified(node, Time());
+void BookmarkModel::ResetDateFolderModified(const BookmarkNode* node) {
+  SetDateFolderModified(node, Time());
 }
 
 void BookmarkModel::GetBookmarksWithTitlesMatching(
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 9c5ebad..e29dfbc 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -293,12 +293,12 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
                      bool is_starred);
 
   // Sets the date modified time of the specified node.
-  void SetDateGroupModified(const BookmarkNode* parent, const base::Time time);
+  void SetDateFolderModified(const BookmarkNode* parent, const base::Time time);
 
   // Resets the 'date modified' time of the node to 0. This is used during
-  // importing to exclude the newly created groups from showing up in the
-  // combobox of most recently modified groups.
-  void ResetDateGroupModified(const BookmarkNode* node);
+  // importing to exclude the newly created folders from showing up in the
+  // combobox of most recently modified folders.
+  void ResetDateFolderModified(const BookmarkNode* node);
 
   void GetBookmarksWithTitlesMatching(
       const string16& text,
diff --git a/chrome/browser/bookmarks/bookmark_node_data.h b/chrome/browser/bookmarks/bookmark_node_data.h
index d45054d..adde83c 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.h
+++ b/chrome/browser/bookmarks/bookmark_node_data.h
@@ -51,7 +51,7 @@ struct BookmarkNodeData {
     // The URL, only valid if is_url is true.
     GURL url;
 
-    // Title of the entry, used for both urls and groups/folders.
+    // Title of the entry, used for both urls and folders.
     string16 title;
 
     // Children, only used for non-URL nodes.
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index c38a44e..7bcfd64 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -116,7 +116,7 @@ int DescendantURLCount(const BookmarkNode* node) {
 }
 
 // Implementation of OpenAll. Opens all nodes of type URL and recurses for
-// groups. |navigator| is the PageNavigator used to open URLs. After the first
+// folders. |navigator| is the PageNavigator used to open URLs. After the first
 // url is opened |opened_url| is set to true and |navigator| is set to the
 // PageNavigator of the last active tab. This is done to handle a window
 // disposition of new window, in which case we want subsequent tabs to open in
@@ -268,7 +268,7 @@ int PerformBookmarkDrop(Profile* profile,
     }
     return ui::DragDropTypes::DRAG_NONE;
   }
-  // Dropping a group from different profile. Always accept.
+  // Dropping a folder from different profile. Always accept.
   bookmark_utils::CloneBookmarkNode(model, data.elements, parent_node, index);
   return ui::DragDropTypes::DRAG_COPY;
 }
@@ -554,7 +554,7 @@ static const BookmarkNode* CreateNewNode(BookmarkModel* model,
       model->AddURL(node, node->child_count(), details.urls[i].second,
                     details.urls[i].first);
     }
-    model->SetDateGroupModified(parent, Time::Now());
+    model->SetDateFolderModified(parent, Time::Now());
   } else {
     NOTREACHED();
     return NULL;
diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h
index cd02045..b2ed767 100644
--- a/chrome/browser/bookmarks/bookmark_utils.h
+++ b/chrome/browser/bookmarks/bookmark_utils.h
@@ -73,7 +73,7 @@ void CloneBookmarkNode(BookmarkModel* model,
                        const BookmarkNode* parent,
                        int index_to_add_at);
 
-// Begins dragging a group of bookmarks.
+// Begins dragging a folder of bookmarks.
 void DragBookmarks(Profile* profile,
                    const std::vector<const BookmarkNode*>& nodes,
                    gfx::NativeView view);
@@ -118,11 +118,11 @@ bool CanPasteFromClipboard(const BookmarkNode* node);
 string16 GetNameForURL(const GURL& url);
 
 // Returns a vector containing up to |max_count| of the most recently modified
-// groups. This never returns an empty vector.
+// folders. This never returns an empty vector.
 std::vector<const BookmarkNode*> GetMostRecentlyModifiedGroups(
     BookmarkModel* model, size_t max_count);
 
-// Returns the most recently added bookmarks. This does not return groups,
+// Returns the most recently added bookmarks. This does not return folders,
 // only nodes of type url.
 void GetMostRecentlyAddedEntries(BookmarkModel* model,
                                  size_t count,
diff --git a/chrome/browser/extensions/extension_bookmark_helpers.cc b/chrome/browser/extensions/extension_bookmark_helpers.cc
index eebdf4c..a66839c8 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.cc
+++ b/chrome/browser/extensions/extension_bookmark_helpers.cc
@@ -33,7 +33,8 @@ DictionaryValue* GetNodeDictionary(const BookmarkNode* node,
     // seconds.
     base::Time t = node->date_folder_modified();
     if (!t.is_null())
-      dict->SetDouble(keys::kDateGroupModifiedKey, floor(t.ToDoubleT() * 1000));
+      dict->SetDouble(keys::kDateFolderModifiedKey,
+                      floor(t.ToDoubleT() * 1000));
   }
 
   dict->SetString(keys::kTitleKey, node->GetTitle());
diff --git a/chrome/browser/extensions/extension_bookmarks_module_constants.cc b/chrome/browser/extensions/extension_bookmarks_module_constants.cc
index 670b5ec..cabd0cf 100644
--- a/chrome/browser/extensions/extension_bookmarks_module_constants.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module_constants.cc
@@ -17,7 +17,7 @@ const char kChildrenKey[] = "children";
 const char kChildIdsKey[] = "childIds";
 const char kRecursiveKey[] = "recursive";
 const char kDateAddedKey[] = "dateAdded";
-const char kDateGroupModifiedKey[] = "dateGroupModified";
+const char kDateFolderModifiedKey[] = "dateGroupModified";
 // TODO(arv): Move bookmark manager related constants out of this file.
 const char kSameProfileKey[] = "sameProfile";
 const char kElementsKey[] = "elements";
diff --git a/chrome/browser/extensions/extension_bookmarks_module_constants.h b/chrome/browser/extensions/extension_bookmarks_module_constants.h
index 27de3a0..a007f75 100644
--- a/chrome/browser/extensions/extension_bookmarks_module_constants.h
+++ b/chrome/browser/extensions/extension_bookmarks_module_constants.h
@@ -22,7 +22,7 @@ extern const char kChildrenKey[];
 extern const char kChildIdsKey[];
 extern const char kRecursiveKey[];
 extern const char kDateAddedKey[];
-extern const char kDateGroupModifiedKey[];
+extern const char kDateFolderModifiedKey[];
 // TODO(arv): Move bookmark manager related constants out of this file.
 extern const char kSameProfileKey[];
 extern const char kElementsKey[];
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index d84a920..4d921a5 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -140,7 +140,7 @@ void ProfileWriter::AddBookmarkEntry(
   for (std::set<const BookmarkNode*>::const_iterator i =
           groups_added_to.begin();
        i != groups_added_to.end(); ++i) {
-    model->ResetDateGroupModified(*i);
+    model->ResetDateFolderModified(*i);
   }
 
   if (import_mode) {