Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1278)

Unified Diff: components/bookmarks/browser/bookmark_utils.cc

Issue 446003002: Title: Same Bookmark url is getting pasted on the Bookmarkbar with same title. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TestCase update. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/bookmarks/browser/bookmark_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..b7d1fcb0f1db0b5a46c24c2128777be28f807032 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,35 @@ void CopyToClipboard(BookmarkModel* model,
}
}
+// Updates |title| such that |url| and |title| pair are unique among the
+// children of |parent|.
+void MakeTitleUnique(const BookmarkModel* model,
+ const BookmarkNode* parent,
+ const GURL& url,
+ base::string16* title) {
+ base::hash_set<base::string16> titles;
+ for (int i = 0; i < parent->child_count(); i++) {
+ const BookmarkNode* node = parent->GetChild(i);
+ if (node->is_url() && (url == node->url()) &&
+ StartsWith(node->GetTitle(), *title, false)) {
+ titles.insert(node->GetTitle());
+ }
+ }
+
+ if (titles.find(*title) == titles.end())
+ return;
+
+ base::string16 new_title = *title;
sky 2014/10/08 15:30:27 new_title should be moved into for loop.
Deepak 2014/10/09 04:23:40 Done.
+ for (size_t i = 0; i < titles.size(); i++) {
+ new_title = base::UTF8ToUTF16(base::StringPrintf(
+ "%s (%lu)", base::UTF16ToUTF8(*title).c_str(), i + 1));
sky 2014/10/08 15:30:27 const base::string16 new_title(*title + base::ASCI
Deepak 2014/10/09 04:23:40 Acknowledged.
+ if (titles.find(new_title) == titles.end()) {
+ *title = new_title;
+ return;
+ }
+ }
+}
+
void PasteFromClipboard(BookmarkModel* model,
const BookmarkNode* parent,
int index) {
@@ -219,6 +251,15 @@ 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)) {
+ MakeTitleUnique(model,
+ parent,
+ bookmark_data.elements[0].url,
+ &bookmark_data.elements[0].title);
+ }
+
CloneBookmarkNode(model, bookmark_data.elements, parent, index, true);
}
« no previous file with comments | « no previous file | components/bookmarks/browser/bookmark_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698