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" |
| 11 #include "base/memory/ptr_util.h" |
11 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
12 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
13 #include "third_party/skia/include/core/SkBitmap.h" | 14 #include "third_party/skia/include/core/SkBitmap.h" |
14 #include "ui/display/win/dpi.h" | 15 #include "ui/display/win/dpi.h" |
15 #include "ui/gfx/geometry/size.h" | 16 #include "ui/gfx/geometry/size.h" |
16 #include "ui/gfx/icon_util.h" | 17 #include "ui/gfx/icon_util.h" |
17 #include "ui/gfx/image/image_skia.h" | 18 #include "ui/gfx/image/image_skia.h" |
18 | 19 |
19 // static | 20 // static |
20 IconLoader::IconGroup IconLoader::GroupForFilepath( | 21 IconLoader::IconGroup IconLoader::GroupForFilepath( |
(...skipping 21 matching lines...) Expand all Loading... |
42 case IconLoader::NORMAL: | 43 case IconLoader::NORMAL: |
43 size = 0; | 44 size = 0; |
44 break; | 45 break; |
45 case IconLoader::LARGE: | 46 case IconLoader::LARGE: |
46 size = SHGFI_LARGEICON; | 47 size = SHGFI_LARGEICON; |
47 break; | 48 break; |
48 default: | 49 default: |
49 NOTREACHED(); | 50 NOTREACHED(); |
50 } | 51 } |
51 | 52 |
52 image_.reset(); | 53 std::unique_ptr<gfx::Image> image; |
53 | 54 |
54 SHFILEINFO file_info = { 0 }; | 55 SHFILEINFO file_info = { 0 }; |
55 if (SHGetFileInfo(group_.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info, | 56 if (SHGetFileInfo(group_.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info, |
56 sizeof(SHFILEINFO), | 57 sizeof(SHFILEINFO), |
57 SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) { | 58 SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) { |
58 std::unique_ptr<SkBitmap> bitmap( | 59 std::unique_ptr<SkBitmap> bitmap( |
59 IconUtil::CreateSkBitmapFromHICON(file_info.hIcon)); | 60 IconUtil::CreateSkBitmapFromHICON(file_info.hIcon)); |
60 if (bitmap.get()) { | 61 if (bitmap.get()) { |
61 gfx::ImageSkia image_skia(gfx::ImageSkiaRep(*bitmap, | 62 gfx::ImageSkia image_skia(gfx::ImageSkiaRep(*bitmap, |
62 display::win::GetDPIScale())); | 63 display::win::GetDPIScale())); |
63 image_skia.MakeThreadSafe(); | 64 image_skia.MakeThreadSafe(); |
64 image_.reset(new gfx::Image(image_skia)); | 65 image = base::MakeUnique<gfx::Image>(image_skia); |
65 DestroyIcon(file_info.hIcon); | 66 DestroyIcon(file_info.hIcon); |
66 } | 67 } |
67 } | 68 } |
68 | 69 |
69 target_task_runner_->PostTask( | 70 target_task_runner_->PostTask( |
70 FROM_HERE, base::Bind(callback_, base::Passed(&image_), group_)); | 71 FROM_HERE, base::Bind(callback_, base::Passed(&image), group_)); |
71 delete this; | 72 delete this; |
72 } | 73 } |
OLD | NEW |