summaryrefslogtreecommitdiffstats
path: root/chrome/browser/icon_manager.cc
diff options
context:
space:
mode:
authorblundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 13:47:13 +0000
committerblundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 13:47:13 +0000
commite95b717f6d7ebfd44ab20c2caea205cc95e0a74e (patch)
treeb3235d083ecf5539e128cf13d2c5d1c09c856786 /chrome/browser/icon_manager.cc
parent70c4ebd0f349842ad96c268965192fc98843cff4 (diff)
downloadchromium_src-e95b717f6d7ebfd44ab20c2caea205cc95e0a74e.zip
chromium_src-e95b717f6d7ebfd44ab20c2caea205cc95e0a74e.tar.gz
chromium_src-e95b717f6d7ebfd44ab20c2caea205cc95e0a74e.tar.bz2
Move CancelableTaskTracker to //base/task/CancelableTaskTracker.
CancelableTaskTracker is used by //chrome code that is due to componentized. This CL moves the class to //base/task and wraps it in the ::base::task namespace. BUG=335135 TBR=thakis Review URL: https://codereview.chromium.org/137263007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_manager.cc')
-rw-r--r--chrome/browser/icon_manager.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/icon_manager.cc b/chrome/browser/icon_manager.cc
index d0e2cbc..a329249 100644
--- a/chrome/browser/icon_manager.cc
+++ b/chrome/browser/icon_manager.cc
@@ -14,7 +14,7 @@
namespace {
void RunCallbackIfNotCanceled(
- const CancelableTaskTracker::IsCanceledCallback& is_canceled,
+ const base::CancelableTaskTracker::IsCanceledCallback& is_canceled,
const IconManager::IconRequestCallback& callback,
gfx::Image* image) {
if (is_canceled.Run())
@@ -55,17 +55,18 @@ gfx::Image* IconManager::LookupIconFromGroup(const IconGroupID& group,
return NULL;
}
-CancelableTaskTracker::TaskId IconManager::LoadIcon(
+base::CancelableTaskTracker::TaskId IconManager::LoadIcon(
const base::FilePath& file_name,
IconLoader::IconSize size,
const IconRequestCallback& callback,
- CancelableTaskTracker* tracker) {
+ base::CancelableTaskTracker* tracker) {
IconLoader* loader = new IconLoader(file_name, size, this);
loader->AddRef();
loader->Start();
- CancelableTaskTracker::IsCanceledCallback is_canceled;
- CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled);
+ base::CancelableTaskTracker::IsCanceledCallback is_canceled;
+ base::CancelableTaskTracker::TaskId id =
+ tracker->NewTrackedTaskId(&is_canceled);
IconRequestCallback callback_runner = base::Bind(
&RunCallbackIfNotCanceled, is_canceled, callback);