| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/icon_loader.h" | 5 #include "chrome/browser/icon_loader.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 IconUtil::CreateSkBitmapFromHICON(file_info.hIcon)); | 59 IconUtil::CreateSkBitmapFromHICON(file_info.hIcon)); |
| 60 if (bitmap.get()) { | 60 if (bitmap.get()) { |
| 61 gfx::ImageSkia image_skia(gfx::ImageSkiaRep(*bitmap, | 61 gfx::ImageSkia image_skia(gfx::ImageSkiaRep(*bitmap, |
| 62 display::win::GetDPIScale())); | 62 display::win::GetDPIScale())); |
| 63 image_skia.MakeThreadSafe(); | 63 image_skia.MakeThreadSafe(); |
| 64 image_.reset(new gfx::Image(image_skia)); | 64 image_.reset(new gfx::Image(image_skia)); |
| 65 DestroyIcon(file_info.hIcon); | 65 DestroyIcon(file_info.hIcon); |
| 66 } | 66 } |
| 67 } | 67 } |
| 68 | 68 |
| 69 // Always notify the delegate, regardless of success. | |
| 70 target_task_runner_->PostTask(FROM_HERE, | 69 target_task_runner_->PostTask(FROM_HERE, |
| 71 base::Bind(&IconLoader::NotifyDelegate, this)); | 70 base::Bind(callback_, base::Unretained(this), |
| 71 base::Passed(&image_), group_)); |
| 72 } | 72 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2586003002:
patch from issue 2577273002 at patchset 20001 (http://crrev.com/2577273002#ps20001)
