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

Unified Diff: chrome/browser/android/provider/chrome_browser_provider.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/android/provider/chrome_browser_provider.h ('k') | chrome/browser/android/shortcut_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/provider/chrome_browser_provider.cc
diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc
index 794a86881e66356c58c83627e892e46e03db6299..f59de09add712f67009205ed8c30486aba1a9ddc 100644
--- a/chrome/browser/android/provider/chrome_browser_provider.cc
+++ b/chrome/browser/android/provider/chrome_browser_provider.cc
@@ -13,6 +13,7 @@
#include "base/logging.h"
#include "base/memory/ref_counted_memory.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/task/cancelable_task_tracker.h"
#include "base/time/time.h"
#include "chrome/browser/android/provider/blocking_ui_thread_async_request.h"
#include "chrome/browser/android/provider/bookmark_model_observer_task.h"
@@ -31,7 +32,6 @@
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/common/cancelable_task_tracker.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "grit/generated_resources.h"
@@ -641,19 +641,19 @@ class FaviconServiceTask : public AsyncServiceRequest<FaviconService> {
FaviconServiceTask(FaviconService* service,
Profile* profile,
CancelableRequestConsumer* cancelable_consumer,
- CancelableTaskTracker* cancelable_tracker)
+ base::CancelableTaskTracker* cancelable_tracker)
: AsyncServiceRequest<FaviconService>(service, cancelable_consumer),
profile_(profile),
cancelable_tracker_(cancelable_tracker) {}
Profile* profile() const { return profile_; }
- CancelableTaskTracker* cancelable_tracker() const {
+ base::CancelableTaskTracker* cancelable_tracker() const {
return cancelable_tracker_;
}
private:
Profile* profile_;
- CancelableTaskTracker* cancelable_tracker_;
+ base::CancelableTaskTracker* cancelable_tracker_;
DISALLOW_COPY_AND_ASSIGN(FaviconServiceTask);
};
@@ -661,13 +661,14 @@ class FaviconServiceTask : public AsyncServiceRequest<FaviconService> {
// Retrieves the favicon or touch icon for a URL from the FaviconService.
class BookmarkIconFetchTask : public FaviconServiceTask {
public:
- BookmarkIconFetchTask(
- FaviconService* favicon_service,
- Profile* profile,
- CancelableRequestConsumer* cancelable_consumer,
- CancelableTaskTracker* cancelable_tracker)
- : FaviconServiceTask(favicon_service, profile,
- cancelable_consumer, cancelable_tracker) {}
+ BookmarkIconFetchTask(FaviconService* favicon_service,
+ Profile* profile,
+ CancelableRequestConsumer* cancelable_consumer,
+ base::CancelableTaskTracker* cancelable_tracker)
+ : FaviconServiceTask(favicon_service,
+ profile,
+ cancelable_consumer,
+ cancelable_tracker) {}
chrome::FaviconBitmapResult Run(const GURL& url) {
RunAsyncRequestOnUIThreadBlocking(
« no previous file with comments | « chrome/browser/android/provider/chrome_browser_provider.h ('k') | chrome/browser/android/shortcut_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698