Index: chrome/browser/icon_manager.cc |
diff --git a/chrome/browser/icon_manager.cc b/chrome/browser/icon_manager.cc |
index 1796f417fadcd22cc2d0d79625b8daa2ceb88b63..4bbe19e0d4971cb10ff7e55c09e7ddd4a757bd61 100644 |
--- a/chrome/browser/icon_manager.cc |
+++ b/chrome/browser/icon_manager.cc |
@@ -26,13 +26,13 @@ void RunCallbackIfNotCanceled( |
} // namespace |
struct IconManager::ClientRequest { |
+ IconLoader* loader; |
sky
2016/12/16 23:27:27
Do you need this anymore?
Avi (use Gerrit)
2016/12/17 02:28:53
I don't need any of this any more :)
|
IconRequestCallback callback; |
base::FilePath file_path; |
IconLoader::IconSize size; |
}; |
-IconManager::IconManager() { |
-} |
+IconManager::IconManager() : weak_factory_(this) {} |
IconManager::~IconManager() { |
} |
@@ -56,8 +56,9 @@ base::CancelableTaskTracker::TaskId IconManager::LoadIcon( |
IconLoader::IconSize size, |
const IconRequestCallback& callback, |
base::CancelableTaskTracker* tracker) { |
- IconLoader* loader = new IconLoader(file_path, size, this); |
- loader->AddRef(); |
+ IconLoader* loader = IconLoader::Create( |
+ file_path, size, |
+ base::Bind(&IconManager::OnIconLoaded, weak_factory_.GetWeakPtr())); |
loader->Start(); |
base::CancelableTaskTracker::IsCanceledCallback is_canceled; |
@@ -66,21 +67,16 @@ base::CancelableTaskTracker::TaskId IconManager::LoadIcon( |
IconRequestCallback callback_runner = base::Bind( |
&RunCallbackIfNotCanceled, is_canceled, callback); |
- requests_[loader] = {callback_runner, file_path, size}; |
+ requests_[loader] = {loader, callback_runner, file_path, size}; |
return id; |
} |
-// IconLoader::Delegate implementation ----------------------------------------- |
- |
-void IconManager::OnImageLoaded(IconLoader* loader, |
- std::unique_ptr<gfx::Image> result, |
- const IconLoader::IconGroup& group) { |
+void IconManager::OnIconLoaded(IconLoader* loader, |
+ std::unique_ptr<gfx::Image> result, |
+ const IconLoader::IconGroup& group) { |
auto request_it = requests_.find(loader); |
DCHECK(request_it != requests_.end()); |
- // Balances the AddRef() in LoadIcon(). |
- loader->Release(); |
- |
const ClientRequest& client_request = request_it->second; |
// Cache the bitmap. Watch out: |result| may be null, which indicates a |