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

Unified Diff: components/bookmarks/core/browser/bookmark_node.cc

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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/core/browser/bookmark_node.cc
diff --git a/components/bookmarks/core/browser/bookmark_node.cc b/components/bookmarks/core/browser/bookmark_node.cc
deleted file mode 100644
index 89a2617f8594d49b1d718f6cab106aa9a1707923..0000000000000000000000000000000000000000
--- a/components/bookmarks/core/browser/bookmark_node.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/bookmarks/core/browser/bookmark_node.h"
-
-#include <map>
-#include <string>
-
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-
-namespace {
-
-// Whitespace characters to strip from bookmark titles.
-const base::char16 kInvalidChars[] = {
- '\n', '\r', '\t',
- 0x2028, // Line separator
- 0x2029, // Paragraph separator
- 0
-};
-
-} // namespace
-
-// BookmarkNode ---------------------------------------------------------------
-
-const int64 BookmarkNode::kInvalidSyncTransactionVersion = -1;
-
-BookmarkNode::BookmarkNode(const GURL& url)
- : url_(url) {
- Initialize(0);
-}
-
-BookmarkNode::BookmarkNode(int64 id, const GURL& url)
- : url_(url) {
- Initialize(id);
-}
-
-BookmarkNode::~BookmarkNode() {
-}
-
-void BookmarkNode::SetTitle(const base::string16& title) {
- // Replace newlines and other problematic whitespace characters in
- // folder/bookmark names with spaces.
- base::string16 trimmed_title;
- base::ReplaceChars(title, kInvalidChars, base::ASCIIToUTF16(" "),
- &trimmed_title);
- ui::TreeNode<BookmarkNode>::SetTitle(trimmed_title);
-}
-
-bool BookmarkNode::IsVisible() const {
- return true;
-}
-
-bool BookmarkNode::GetMetaInfo(const std::string& key,
- std::string* value) const {
- if (!meta_info_map_)
- return false;
-
- MetaInfoMap::const_iterator it = meta_info_map_->find(key);
- if (it == meta_info_map_->end())
- return false;
-
- *value = it->second;
- return true;
-}
-
-bool BookmarkNode::SetMetaInfo(const std::string& key,
- const std::string& value) {
- if (!meta_info_map_)
- meta_info_map_.reset(new MetaInfoMap);
-
- MetaInfoMap::iterator it = meta_info_map_->find(key);
- if (it == meta_info_map_->end()) {
- (*meta_info_map_)[key] = value;
- return true;
- }
- // Key already in map, check if the value has changed.
- if (it->second == value)
- return false;
- it->second = value;
- return true;
-}
-
-bool BookmarkNode::DeleteMetaInfo(const std::string& key) {
- if (!meta_info_map_)
- return false;
- bool erased = meta_info_map_->erase(key) != 0;
- if (meta_info_map_->empty())
- meta_info_map_.reset();
- return erased;
-}
-
-void BookmarkNode::SetMetaInfoMap(const MetaInfoMap& meta_info_map) {
- if (meta_info_map.empty())
- meta_info_map_.reset();
- else
- meta_info_map_.reset(new MetaInfoMap(meta_info_map));
-}
-
-const BookmarkNode::MetaInfoMap* BookmarkNode::GetMetaInfoMap() const {
- return meta_info_map_.get();
-}
-
-void BookmarkNode::Initialize(int64 id) {
- id_ = id;
- type_ = url_.is_empty() ? FOLDER : URL;
- date_added_ = base::Time::Now();
- favicon_type_ = favicon_base::INVALID_ICON;
- favicon_state_ = INVALID_FAVICON;
- favicon_load_task_id_ = base::CancelableTaskTracker::kBadTaskId;
- meta_info_map_.reset();
- sync_transaction_version_ = kInvalidSyncTransactionVersion;
-}
-
-void BookmarkNode::InvalidateFavicon() {
- icon_url_ = GURL();
- favicon_ = gfx::Image();
- favicon_type_ = favicon_base::INVALID_ICON;
- favicon_state_ = INVALID_FAVICON;
-}
-
-// BookmarkPermanentNode -------------------------------------------------------
-
-BookmarkPermanentNode::BookmarkPermanentNode(int64 id)
- : BookmarkNode(id, GURL()),
- visible_(true) {
-}
-
-BookmarkPermanentNode::~BookmarkPermanentNode() {
-}
-
-bool BookmarkPermanentNode::IsVisible() const {
- return visible_ || !empty();
-}
« no previous file with comments | « components/bookmarks/core/browser/bookmark_node.h ('k') | components/bookmarks/core/browser/bookmark_node_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698