summaryrefslogtreecommitdiffstats
path: root/components/enhanced_bookmarks/bookmark_server_cluster_service.cc
diff options
context:
space:
mode:
authordanduong <danduong@chromium.org>2014-10-29 10:56:40 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 17:56:54 +0000
commitc05c52e88c34a617b253fcd32450768445f44568 (patch)
tree1edb0960d14e888b336c77bcdfdcc52ac512e80c /components/enhanced_bookmarks/bookmark_server_cluster_service.cc
parentd026bc969fce5167b30df795bd4bba4df2a282ee (diff)
downloadchromium_src-c05c52e88c34a617b253fcd32450768445f44568.zip
chromium_src-c05c52e88c34a617b253fcd32450768445f44568.tar.gz
chromium_src-c05c52e88c34a617b253fcd32450768445f44568.tar.bz2
Filter out clusters with no nodes when getting filters.
BUG=423953 Review URL: https://codereview.chromium.org/682373003 Cr-Commit-Position: refs/heads/master@{#301872}
Diffstat (limited to 'components/enhanced_bookmarks/bookmark_server_cluster_service.cc')
-rw-r--r--components/enhanced_bookmarks/bookmark_server_cluster_service.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/components/enhanced_bookmarks/bookmark_server_cluster_service.cc b/components/enhanced_bookmarks/bookmark_server_cluster_service.cc
index ca38c1c..0d85539 100644
--- a/components/enhanced_bookmarks/bookmark_server_cluster_service.cc
+++ b/components/enhanced_bookmarks/bookmark_server_cluster_service.cc
@@ -93,8 +93,16 @@ const std::vector<std::string> BookmarkServerClusterService::GetClusters()
const {
std::vector<std::string> cluster_names;
- for (auto& pair : cluster_data_)
- cluster_names.push_back(pair.first);
+ for (auto& pair : cluster_data_) {
+ for (auto& star_id : pair.second) {
+ const BookmarkNode* bookmark = BookmarkForRemoteId(star_id);
+ if (bookmark) {
+ // Only add clusters that have children.
+ cluster_names.push_back(pair.first);
+ break;
+ }
+ }
+ }
return cluster_names;
}