OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/ptr_util.h" |
8 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
9 #include "base/nix/mime_util_xdg.h" | 10 #include "base/nix/mime_util_xdg.h" |
10 #include "ui/views/linux_ui/linux_ui.h" | 11 #include "ui/views/linux_ui/linux_ui.h" |
11 | 12 |
12 // static | 13 // static |
13 IconLoader::IconGroup IconLoader::GroupForFilepath( | 14 IconLoader::IconGroup IconLoader::GroupForFilepath( |
14 const base::FilePath& file_path) { | 15 const base::FilePath& file_path) { |
15 return base::nix::GetFileMimeType(file_path); | 16 return base::nix::GetFileMimeType(file_path); |
16 } | 17 } |
17 | 18 |
(...skipping 13 matching lines...) Expand all Loading... |
31 case IconLoader::NORMAL: | 32 case IconLoader::NORMAL: |
32 size_pixels = 32; | 33 size_pixels = 32; |
33 break; | 34 break; |
34 case IconLoader::LARGE: | 35 case IconLoader::LARGE: |
35 size_pixels = 48; | 36 size_pixels = 48; |
36 break; | 37 break; |
37 default: | 38 default: |
38 NOTREACHED(); | 39 NOTREACHED(); |
39 } | 40 } |
40 | 41 |
| 42 std::unique_ptr<gfx::Image> image; |
41 views::LinuxUI* ui = views::LinuxUI::instance(); | 43 views::LinuxUI* ui = views::LinuxUI::instance(); |
42 if (ui) { | 44 if (ui) { |
43 gfx::Image image = ui->GetIconForContentType(group_, size_pixels); | 45 image = base::MakeUnique<gfx::Image>( |
44 if (!image.IsEmpty()) | 46 ui->GetIconForContentType(group_, size_pixels)); |
45 image_.reset(new gfx::Image(image)); | 47 if (image->IsEmpty()) |
| 48 image = nullptr; |
46 } | 49 } |
47 | 50 |
48 target_task_runner_->PostTask( | 51 target_task_runner_->PostTask( |
49 FROM_HERE, base::Bind(callback_, base::Passed(&image_), group_)); | 52 FROM_HERE, base::Bind(callback_, base::Passed(&image), group_)); |
50 delete this; | 53 delete this; |
51 } | 54 } |
OLD | NEW |