| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 | 54 |
| 55 image_.reset(); | 55 image_.reset(); |
| 56 | 56 |
| 57 SHFILEINFO file_info = { 0 }; | 57 SHFILEINFO file_info = { 0 }; |
| 58 if (SHGetFileInfo(group_.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info, | 58 if (SHGetFileInfo(group_.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info, |
| 59 sizeof(SHFILEINFO), | 59 sizeof(SHFILEINFO), |
| 60 SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) { | 60 SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) { |
| 61 scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON( | 61 scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON( |
| 62 file_info.hIcon)); | 62 file_info.hIcon)); |
| 63 if (bitmap.get()) { | 63 if (bitmap.get()) { |
| 64 gfx::ImageSkia image_skia(gfx::ImageSkiaRep( | 64 gfx::ImageSkia image_skia(gfx::ImageSkiaRep(*bitmap, gfx::GetDPIScale())); |
| 65 *bitmap, gfx::win::GetDeviceScaleFactor())); | |
| 66 image_skia.MakeThreadSafe(); | 65 image_skia.MakeThreadSafe(); |
| 67 image_.reset(new gfx::Image(image_skia)); | 66 image_.reset(new gfx::Image(image_skia)); |
| 68 DestroyIcon(file_info.hIcon); | 67 DestroyIcon(file_info.hIcon); |
| 69 } | 68 } |
| 70 } | 69 } |
| 71 | 70 |
| 72 // Always notify the delegate, regardless of success. | 71 // Always notify the delegate, regardless of success. |
| 73 target_message_loop_->PostTask(FROM_HERE, | 72 target_message_loop_->PostTask(FROM_HERE, |
| 74 base::Bind(&IconLoader::NotifyDelegate, this)); | 73 base::Bind(&IconLoader::NotifyDelegate, this)); |
| 75 } | 74 } |
| OLD | NEW |