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

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

Issue 1124103005: bookmarks: Do not handle some failures. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks/browser/bookmark_model.cc
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index 2e174dbedc63314fc2de85d1accdda9582439c90..d781fdbe8242beed9270e347d1384cdcdddec876 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -313,10 +313,8 @@ favicon_base::IconType BookmarkModel::GetFaviconType(const BookmarkNode* node) {
void BookmarkModel::SetTitle(const BookmarkNode* node,
const base::string16& title) {
- if (!node) {
- NOTREACHED();
- return;
- }
+ DCHECK(node);
+
if (node->GetTitle() == title)
return;
@@ -342,16 +340,7 @@ void BookmarkModel::SetTitle(const BookmarkNode* node,
}
void BookmarkModel::SetURL(const BookmarkNode* node, const GURL& url) {
- if (!node) {
- NOTREACHED();
- return;
- }
-
- // We cannot change the URL of a folder.
- if (node->is_folder()) {
- NOTREACHED();
- return;
- }
+ DCHECK(node && !node->is_folder());
if (node->url() == url)
return;
@@ -467,21 +456,12 @@ void BookmarkModel::OnFaviconChanged(const std::set<GURL>& urls) {
}
}
-void BookmarkModel::SetDateAdded(const BookmarkNode* node,
- Time date_added) {
- if (!node) {
- NOTREACHED();
- return;
- }
+void BookmarkModel::SetDateAdded(const BookmarkNode* node, Time date_added) {
+ DCHECK(node && !is_permanent_node(node));
if (node->date_added() == date_added)
return;
- if (is_permanent_node(node)) {
- NOTREACHED();
- return;
- }
-
AsMutable(node)->set_date_added(date_added);
// Syncing might result in dates newer than the folder's last modified date.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698