Commit 5ebd536b authored by tfarina's avatar tfarina Committed by Commit bot

bookmarks: Do not handle some failures.

In those cases |node| should not be NULL.

R=sky@chromium.org

Review URL: https://codereview.chromium.org/1124103005

Cr-Commit-Position: refs/heads/master@{#329502}
parent 89d63e4b
...@@ -313,10 +313,8 @@ favicon_base::IconType BookmarkModel::GetFaviconType(const BookmarkNode* node) { ...@@ -313,10 +313,8 @@ favicon_base::IconType BookmarkModel::GetFaviconType(const BookmarkNode* node) {
void BookmarkModel::SetTitle(const BookmarkNode* node, void BookmarkModel::SetTitle(const BookmarkNode* node,
const base::string16& title) { const base::string16& title) {
if (!node) { DCHECK(node);
NOTREACHED();
return;
}
if (node->GetTitle() == title) if (node->GetTitle() == title)
return; return;
...@@ -342,16 +340,7 @@ void BookmarkModel::SetTitle(const BookmarkNode* node, ...@@ -342,16 +340,7 @@ void BookmarkModel::SetTitle(const BookmarkNode* node,
} }
void BookmarkModel::SetURL(const BookmarkNode* node, const GURL& url) { void BookmarkModel::SetURL(const BookmarkNode* node, const GURL& url) {
if (!node) { DCHECK(node && !node->is_folder());
NOTREACHED();
return;
}
// We cannot change the URL of a folder.
if (node->is_folder()) {
NOTREACHED();
return;
}
if (node->url() == url) if (node->url() == url)
return; return;
...@@ -467,21 +456,12 @@ void BookmarkModel::OnFaviconChanged(const std::set<GURL>& urls) { ...@@ -467,21 +456,12 @@ void BookmarkModel::OnFaviconChanged(const std::set<GURL>& urls) {
} }
} }
void BookmarkModel::SetDateAdded(const BookmarkNode* node, void BookmarkModel::SetDateAdded(const BookmarkNode* node, Time date_added) {
Time date_added) { DCHECK(node && !is_permanent_node(node));
if (!node) {
NOTREACHED();
return;
}
if (node->date_added() == date_added) if (node->date_added() == date_added)
return; return;
if (is_permanent_node(node)) {
NOTREACHED();
return;
}
AsMutable(node)->set_date_added(date_added); AsMutable(node)->set_date_added(date_added);
// Syncing might result in dates newer than the folder's last modified date. // Syncing might result in dates newer than the folder's last modified date.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment