From a48f87d18fb4befc85ce063ca4233222a4768ef2 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 9 Oct 2012 18:06:33 +0000 Subject: bookmarks: Merge two BookmarkCodec header doc comments into one. R=sky@chromium.org Review URL: https://codereview.chromium.org/11094002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160875 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/bookmarks/bookmark_codec.h | 9 +++------ chrome/browser/bookmarks/bookmark_model.cc | 10 ++++------ chrome/browser/bookmarks/bookmark_node_data_unittest.cc | 3 ++- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/chrome/browser/bookmarks/bookmark_codec.h b/chrome/browser/bookmarks/bookmark_codec.h index 787c2d5..347abb7 100644 --- a/chrome/browser/bookmarks/bookmark_codec.h +++ b/chrome/browser/bookmarks/bookmark_codec.h @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// BookmarkCodec is responsible for encoding and decoding the BookmarkModel -// into JSON values. The encoded values are written to disk via the -// BookmarkService. - #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_CODEC_H_ #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_CODEC_H_ @@ -25,8 +21,9 @@ class ListValue; class Value; } -// BookmarkCodec is responsible for encoding/decoding bookmarks into JSON -// values. +// BookmarkCodec is responsible for encoding and decoding the BookmarkModel +// into JSON values. The encoded values are written to disk via the +// BookmarkStorage. class BookmarkCodec { public: // Creates an instance of the codec. During decoding, if the IDs in the file diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 54da00e..84b41c6 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -62,7 +62,6 @@ void BookmarkNode::SetTitle(const string16& title) { ui::TreeNode::SetTitle(CollapseWhitespace(title, false)); } - bool BookmarkNode::IsVisible() const { return true; } @@ -88,10 +87,10 @@ class SortComparator : public std::binary_function { public: - explicit SortComparator(icu::Collator* collator) : collator_(collator) { } + explicit SortComparator(icu::Collator* collator) : collator_(collator) {} - // Returns true if lhs preceeds rhs. - bool operator() (const BookmarkNode* n1, const BookmarkNode* n2) { + // Returns true if |n1| preceeds |n2|. + bool operator()(const BookmarkNode* n1, const BookmarkNode* n2) { if (n1->type() == n2->type()) { // Types are the same, compare the names. if (!collator_) @@ -591,8 +590,7 @@ void BookmarkModel::RemoveNode(BookmarkNode* node, RemoveNode(node->GetChild(i), removed_urls); } -void BookmarkModel::DoneLoading( - BookmarkLoadDetails* details_delete_me) { +void BookmarkModel::DoneLoading(BookmarkLoadDetails* details_delete_me) { DCHECK(details_delete_me); scoped_ptr details(details_delete_me); if (loaded_) { diff --git a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc index 6589a4f..8c78c71 100644 --- a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc @@ -22,7 +22,8 @@ class BookmarkNodeDataTest : public testing::Test { public: BookmarkNodeDataTest() : ui_thread_(BrowserThread::UI, &loop_), - file_thread_(BrowserThread::FILE, &loop_) { } + file_thread_(BrowserThread::FILE, &loop_) { + } private: MessageLoop loop_; -- cgit v1.1