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

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

Issue 870293002: bookmarks: BookmarkNodeData's size() cleanups. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review Created 5 years, 11 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
Index: components/bookmarks/browser/bookmark_node_data.cc
diff --git a/components/bookmarks/browser/bookmark_node_data.cc b/components/bookmarks/browser/bookmark_node_data.cc
index 5f134eee3bb802c89ed9d62b0edfc9ba91636d33..a781516fbf9c4440d4fde98d85272b17ec5b58f8 100644
--- a/components/bookmarks/browser/bookmark_node_data.cc
+++ b/components/bookmarks/browser/bookmark_node_data.cc
@@ -160,7 +160,7 @@ void BookmarkNodeData::WriteToClipboard(ui::ClipboardType clipboard_type) {
// If there is only one element and it is a URL, write the URL to the
// clipboard.
- if (elements.size() == 1 && elements[0].is_url) {
+ if (has_single_url()) {
const base::string16& title = elements[0].title;
const std::string url = elements[0].url.spec();
@@ -180,7 +180,7 @@ void BookmarkNodeData::WriteToClipboard(ui::ClipboardType clipboard_type) {
// We have either more than one URL, a folder, or a combination of URLs
// and folders.
base::string16 text;
- for (size_t i = 0; i < elements.size(); i++) {
+ for (size_t i = 0; i < size(); i++) {
text += i == 0 ? base::ASCIIToUTF16("") : base::ASCIIToUTF16("\n");
if (!elements[i].is_url) {
// Then it's a folder. Only copy the name of the folder.
@@ -234,9 +234,9 @@ bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) {
void BookmarkNodeData::WriteToPickle(const base::FilePath& profile_path,
Pickle* pickle) const {
profile_path.WriteToPickle(pickle);
- pickle->WriteSizeT(elements.size());
+ pickle->WriteSizeT(size());
- for (size_t i = 0; i < elements.size(); ++i)
+ for (size_t i = 0; i < size(); ++i)
elements[i].WriteToPickle(pickle);
}
@@ -266,7 +266,7 @@ std::vector<const BookmarkNode*> BookmarkNodeData::GetNodes(
if (!IsFromProfilePath(profile_path))
return nodes;
- for (size_t i = 0; i < elements.size(); ++i) {
+ for (size_t i = 0; i < size(); ++i) {
const BookmarkNode* node = GetBookmarkNodeByID(model, elements[i].id_);
if (!node) {
nodes.clear();
« no previous file with comments | « components/bookmarks/browser/bookmark_node_data.h ('k') | components/bookmarks/browser/bookmark_node_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698