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

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

Issue 137263007: Move CancelableTaskTracker to //base/task/CancelableTaskTracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move to base/task/cancelable_task_tracker* Created 6 years, 10 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 | « chrome/browser/bookmarks/bookmark_model.h ('k') | chrome/browser/browsing_data/browsing_data_remover.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_model.cc
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 84b78a8b2cf7ce620a29a6cdf2762c8d7cd21b1f..6611a04c306f788e63c0c85ddc8adb0f441fa90e 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -138,7 +138,7 @@ void BookmarkNode::Initialize(int64 id) {
type_ = url_.is_empty() ? FOLDER : URL;
date_added_ = Time::Now();
favicon_state_ = INVALID_FAVICON;
- favicon_load_task_id_ = CancelableTaskTracker::kBadTaskId;
+ favicon_load_task_id_ = base::CancelableTaskTracker::kBadTaskId;
meta_info_map_.reset();
sync_transaction_version_ = kInvalidSyncTransactionVersion;
}
@@ -987,7 +987,7 @@ void BookmarkModel::OnFaviconDataAvailable(
BookmarkNode* node,
const chrome::FaviconImageResult& image_result) {
DCHECK(node);
- node->set_favicon_load_task_id(CancelableTaskTracker::kBadTaskId);
+ node->set_favicon_load_task_id(base::CancelableTaskTracker::kBadTaskId);
node->set_favicon_state(BookmarkNode::LOADED_FAVICON);
if (!image_result.image.IsEmpty()) {
node->set_favicon(image_result.image);
@@ -1021,9 +1021,9 @@ void BookmarkModel::FaviconLoaded(const BookmarkNode* node) {
}
void BookmarkModel::CancelPendingFaviconLoadRequests(BookmarkNode* node) {
- if (node->favicon_load_task_id() != CancelableTaskTracker::kBadTaskId) {
+ if (node->favicon_load_task_id() != base::CancelableTaskTracker::kBadTaskId) {
cancelable_task_tracker_.TryCancel(node->favicon_load_task_id());
- node->set_favicon_load_task_id(CancelableTaskTracker::kBadTaskId);
+ node->set_favicon_load_task_id(base::CancelableTaskTracker::kBadTaskId);
}
}
« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.h ('k') | chrome/browser/browsing_data/browsing_data_remover.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698