Index: components/bookmarks/browser/bookmark_utils.cc |
diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc |
index a60a86d0020c6eeb0f231b13e5ee0be270b581e2..c7efa029cc2680b1bf5fa56f365da234c2f84959 100644 |
--- a/components/bookmarks/browser/bookmark_utils.cc |
+++ b/components/bookmarks/browser/bookmark_utils.cc |
@@ -8,11 +8,14 @@ |
#include "base/basictypes.h" |
#include "base/bind.h" |
+#include "base/containers/hash_tables.h" |
#include "base/files/file_path.h" |
#include "base/i18n/case_conversion.h" |
#include "base/i18n/string_search.h" |
#include "base/metrics/user_metrics_action.h" |
#include "base/prefs/pref_service.h" |
+#include "base/strings/string_util.h" |
+#include "base/strings/stringprintf.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/time/time.h" |
#include "components/bookmarks/browser/bookmark_client.h" |
@@ -201,6 +204,36 @@ void CopyToClipboard(BookmarkModel* model, |
} |
} |
+void UpdateCopiedBookmarkTitle(BookmarkModel* model, |
+ const BookmarkNode* parent, |
+ BookmarkNodeData* bookmark_data) { |
sky
2014/09/30 15:45:16
BookmarkNodeData may contain any number of bookmar
Deepak
2014/10/01 05:13:09
Done.
|
+ base::hash_set<base::string16> titles; |
+ base::string16 new_title = bookmark_data->elements[0].title; |
+ for (int i = 0; i < parent->child_count(); i++) { |
+ const BookmarkNode* node = parent->GetChild(i); |
+ if (node->is_url() && (bookmark_data->elements[0].url == node->url()) && |
+ (new_title == node->GetTitle() || |
+ StartsWith(node->GetTitle(), new_title, false))) { |
+ titles.insert(node->GetTitle()); |
+ } |
+ } |
+ |
+ if (titles.find(new_title) == titles.end()) { |
+ new_title = bookmark_data->elements[0].title; |
+ } else { |
+ for (size_t i = 0; i < titles.size(); i++) { |
+ new_title = base::UTF8ToUTF16(base::StringPrintf( |
+ "%s(%lu)", |
+ base::UTF16ToUTF8(bookmark_data->elements[0].title).c_str(), |
+ i + 1)); |
+ if (titles.find(new_title) == titles.end()) |
+ break; |
+ } |
+ } |
+ |
+ bookmark_data->elements[0].title = new_title; |
+} |
+ |
void PasteFromClipboard(BookmarkModel* model, |
const BookmarkNode* parent, |
int index) { |
@@ -219,6 +252,11 @@ void PasteFromClipboard(BookmarkModel* model, |
if (index == -1) |
index = parent->child_count(); |
ScopedGroupBookmarkActions group_paste(model); |
+ |
+ if (bookmark_data.elements.size() == 1 && |
+ model->IsBookmarked(bookmark_data.elements[0].url)) |
+ UpdateCopiedBookmarkTitle(model, parent, &bookmark_data); |
+ |
CloneBookmarkNode(model, bookmark_data.elements, parent, index, true); |
} |