Issue 113073002: chrome.bookmark.search exact URL/title query support - Code Review

Chromium Code Reviews

[email protected] (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(12)

My Issues | Starred Open | Closed | All

Issue 113073002: chrome.bookmark.search exact URL/title query support (Closed)

Created:
7 years ago by Mike Wittman

Modified:
7 years ago

Reviewers:
sky, not at google - send to devlin

CC:
chromium-reviews, tfarina, browser-components-watch_chromium.org, extensions-reviews_chromium.org, chromium-apps-reviews_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

chrome.bookmark.search exact URL/title query support Allow queries for exact URL and title strings within chrome.bookmark.search by accepting an object for the query parameter, with the desired query predicates specified on the object. API proposal document: https://docs.google.com/a/chromium.org/document/d/1XZHmtCBQNqaGUZLJPbSL7TXkP3AMhqyxwJk6ez5pMMs/edit BUG=311282 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=241203

Patch Set 1 #

Total comments: 10

Patch Set 2 : Cleanup conditions #

Total comments: 2

Patch Set 3 : Update comment #

Patch Set 4 : Rebase #

Patch Set 5 : Rebase #

Patch Set 6 : Fix logic error #

Patch Set 7 : Make clang happy #

Patch Set 8 : Clang fixes #

Created: 7 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+244 lines, -37 lines)			Patch
	M	chrome/browser/bookmarks/bookmark_utils.h	View	1 2 3 4 5 6 7	2 chunks	+19 lines, -8 lines	0 comments	Download
	M	chrome/browser/bookmarks/bookmark_utils.cc	View	1 2 3 4 5 6 7	2 chunks	+32 lines, -13 lines	0 comments	Download
	M	chrome/browser/bookmarks/bookmark_utils_unittest.cc	View	1 2 3 4 5 6	2 chunks	+136 lines, -7 lines	0 comments	Download
	M	chrome/browser/extensions/api/bookmarks/bookmarks_api.cc	View	1 2 3	1 chunk	+28 lines, -6 lines	0 comments	Download
	M	chrome/common/extensions/api/bookmarks.json	View		1 chunk	+29 lines, -3 lines	0 comments	Download

Messages

Total messages: 18 (0 generated)

Expand Messages | Collapse Messages

Mike Wittman

PTAL sky for chrome/browser/bookmarks kalman for chrome/{browser,common}/extensions One question: to what extent should this change ...

7 years ago (2013-12-11 19:38:51 UTC) #1

sky

https://codereview.chromium.org/113073002/diff/1/chrome/browser/bookmarks/bookmark_utils.cc File chrome/browser/bookmarks/bookmark_utils.cc (right): https://codereview.chromium.org/113073002/diff/1/chrome/browser/bookmarks/bookmark_utils.cc#newcode231 chrome/browser/bookmarks/bookmark_utils.cc:231: bool node_matches = true; use continue rather than node_matches? ...

7 years ago (2013-12-11 21:06:02 UTC) #2

Mike Wittman

https://codereview.chromium.org/113073002/diff/1/chrome/browser/bookmarks/bookmark_utils.cc File chrome/browser/bookmarks/bookmark_utils.cc (right): https://codereview.chromium.org/113073002/diff/1/chrome/browser/bookmarks/bookmark_utils.cc#newcode231 chrome/browser/bookmarks/bookmark_utils.cc:231: bool node_matches = true; On 2013/12/11 21:06:02, sky wrote: ...

7 years ago (2013-12-11 22:24:15 UTC) #4

sky

LGTM https://codereview.chromium.org/113073002/diff/20001/chrome/browser/bookmarks/bookmark_utils.h File chrome/browser/bookmarks/bookmark_utils.h (right): https://codereview.chromium.org/113073002/diff/20001/chrome/browser/bookmarks/bookmark_utils.h#newcode73 chrome/browser/bookmarks/bookmark_utils.h:73: // Returns up to |max_count| bookmarks from |model| ...

7 years ago (2013-12-11 23:46:12 UTC) #5

Mike Wittman

https://codereview.chromium.org/113073002/diff/20001/chrome/browser/bookmarks/bookmark_utils.h File chrome/browser/bookmarks/bookmark_utils.h (right): https://codereview.chromium.org/113073002/diff/20001/chrome/browser/bookmarks/bookmark_utils.h#newcode73 chrome/browser/bookmarks/bookmark_utils.h:73: // Returns up to |max_count| bookmarks from |model| whose ...

7 years ago (2013-12-12 00:18:26 UTC) #6

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/[email protected]/113073002/60001

7 years ago (2013-12-13 19:50:03 UTC) #7

commit-bot: I haz the power

Failed to apply patch for chrome/browser/bookmarks/bookmark_utils.cc: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

7 years ago (2013-12-13 19:50:07 UTC) #8

Failed to apply patch for chrome/browser/bookmarks/bookmark_utils.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/bookmarks/bookmark_utils.cc
  Hunk #1 FAILED at 216.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/bookmarks/bookmark_utils.cc.rej

Patch:       chrome/browser/bookmarks/bookmark_utils.cc
Index: chrome/browser/bookmarks/bookmark_utils.cc
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc
b/chrome/browser/bookmarks/bookmark_utils.cc
index
5aa4f07ab183d1d7b44449076d313b1d8945271b..6fd2d07b049681bbd7ec27a1f17832de16f31871
100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -216,25 +216,41 @@ bool MoreRecentlyAdded(const BookmarkNode* n1, const
BookmarkNode* n2) {
   return n1->date_added() > n2->date_added();
 }
 
-void GetBookmarksContainingText(BookmarkModel* model,
-                                const base::string16& text,
-                                size_t max_count,
-                                const std::string& languages,
-                                std::vector<const BookmarkNode*>* nodes) {
-  std::vector<string16> words;
+void GetBookmarksMatchingProperties(BookmarkModel* model,
+                                    const QueryFields& query,
+                                    size_t max_count,
+                                    const std::string& languages,
+                                    std::vector<const BookmarkNode*>* nodes) {
+  std::vector<string16> query_words;
   QueryParser parser;
-  parser.ParseQueryWords(base::i18n::ToLower(text), &words);
-  if (words.empty())
-    return;
+  if (query.word_phrase_query) {
+    parser.ParseQueryWords(base::i18n::ToLower(*query.word_phrase_query),
+                           &query_words);
+  }
 
   ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node());
   while (iterator.has_next()) {
     const BookmarkNode* node = iterator.Next();
-    if (DoesBookmarkContainWords(node, words, languages)) {
-      nodes->push_back(node);
-      if (nodes->size() == max_count)
-        return;
+    if (!query_words.empty() &&
+        DoesBookmarkContainWords(node, query_words, languages)) {
+      continue;
     }
+    if (query.url) {
+      // Check against bare url spec and IDN-decoded url.
+      if (!node->is_url() ||
+          !(UTF8ToUTF16(node->url().spec()) == *query.url ||
+            net::FormatUrl(
+                node->url(), languages, net::kFormatUrlOmitNothing,
+                net::UnescapeRule::NORMAL, NULL, NULL, NULL) == *query.url)) {
+        continue;
+      }
+    }
+    if (query.title && node->GetTitle() != *query.title)
+      continue;
+
+    nodes->push_back(node);
+    if (nodes->size() == max_count)
+      return;
   }
 }

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/[email protected]/113073002/80001

7 years ago (2013-12-13 23:54:37 UTC) #9

commit-bot: I haz the power

Retried try job too often on mac_rel for step(s) base_unittests, browser_tests, interactive_ui_tests, net_unittests, unit_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&number=202069

7 years ago (2013-12-14 00:26:46 UTC) #10

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/[email protected]/113073002/100001

7 years ago (2013-12-16 20:30:20 UTC) #11

commit-bot: I haz the power

Retried try job too often on mac_rel for step(s) base_unittests, browser_tests, interactive_ui_tests, net_unittests, unit_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&number=203340

7 years ago (2013-12-16 21:13:12 UTC) #12

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/[email protected]/113073002/160001

7 years ago (2013-12-16 21:26:27 UTC) #13

commit-bot: I haz the power

Retried try job too often on mac_rel for step(s) base_unittests, browser_tests, interactive_ui_tests, net_unittests, unit_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&number=203377

7 years ago (2013-12-16 21:54:43 UTC) #14

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/[email protected]/113073002/180001

7 years ago (2013-12-16 22:27:33 UTC) #15

commit-bot: I haz the power

Retried try job too often on android_clang_dbg for step(s) slave_steps http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_clang_dbg&number=101665

7 years ago (2013-12-16 23:34:33 UTC) #16

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/[email protected]/113073002/200001

7 years ago (2013-12-17 00:18:34 UTC) #17

Message was sent while issue was closed.

Change committed as 241203

Expand Messages | Collapse Messages

Powered by Google App Engine

This is Rietveld 408576698