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

Unified Diff: chrome/browser/jumplist_win.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/jumplist_win.h ('k') | chrome/browser/notifications/message_center_settings_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/jumplist_win.cc
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc
index 9ad7720ab647bed1c360cd21f5739dffbea9b63f..5b5da7b5d7bce88b1e7fbe89c2ed6c891e9c841e 100644
--- a/chrome/browser/jumplist_win.cc
+++ b/chrome/browser/jumplist_win.cc
@@ -466,8 +466,7 @@ bool UpdateJumpList(const wchar_t* app_id,
JumpList::JumpList()
: weak_ptr_factory_(this),
profile_(NULL),
- task_id_(CancelableTaskTracker::kBadTaskId) {
-}
+ task_id_(base::CancelableTaskTracker::kBadTaskId) {}
JumpList::~JumpList() {
Terminate();
@@ -553,9 +552,9 @@ void JumpList::RemoveObserver() {
}
void JumpList::CancelPendingUpdate() {
- if (task_id_ != CancelableTaskTracker::kBadTaskId) {
+ if (task_id_ != base::CancelableTaskTracker::kBadTaskId) {
cancelable_task_tracker_.TryCancel(task_id_);
- task_id_ = CancelableTaskTracker::kBadTaskId;
+ task_id_ = base::CancelableTaskTracker::kBadTaskId;
}
}
@@ -697,7 +696,7 @@ void JumpList::OnFaviconDataAvailable(
const chrome::FaviconImageResult& image_result) {
// If there is currently a favicon request in progress, it is now outdated,
// as we have received another, so nullify the handle from the old request.
- task_id_ = CancelableTaskTracker::kBadTaskId;
+ task_id_ = base::CancelableTaskTracker::kBadTaskId;
// lock the list to set icon data and pop the url
{
base::AutoLock auto_lock(list_lock_);
« no previous file with comments | « chrome/browser/jumplist_win.h ('k') | chrome/browser/notifications/message_center_settings_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698