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/memory/ptr_util.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/nix/mime_util_xdg.h" | 10 #include "base/nix/mime_util_xdg.h" |
11 #include "ui/views/linux_ui/linux_ui.h" | 11 #include "ui/views/linux_ui/linux_ui.h" |
12 | 12 |
13 // static | 13 // static |
14 IconLoader::IconGroup IconLoader::GroupForFilepath( | 14 IconLoader::IconGroup IconLoader::GroupForFilepath( |
15 const base::FilePath& file_path) { | 15 const base::FilePath& file_path) { |
16 return base::nix::GetFileMimeType(file_path); | 16 return base::nix::GetFileMimeType(file_path); |
17 } | 17 } |
18 | 18 |
19 // static | 19 // static |
20 content::BrowserThread::ID IconLoader::ReadIconThreadID() { | 20 bool IconLoader::ReadIconRequiresUIThread() { |
21 // ReadIcon() calls into views::LinuxUI and GTK2 code, so it must be on the UI | 21 // ReadIcon() calls into views::LinuxUI and GTK2 code, so it must be on the UI |
22 // thread. | 22 // thread. |
23 return content::BrowserThread::UI; | 23 return true; |
24 } | 24 } |
25 | 25 |
26 void IconLoader::ReadIcon() { | 26 void IconLoader::ReadIcon() { |
27 int size_pixels = 0; | 27 int size_pixels = 0; |
28 switch (icon_size_) { | 28 switch (icon_size_) { |
29 case IconLoader::SMALL: | 29 case IconLoader::SMALL: |
30 size_pixels = 16; | 30 size_pixels = 16; |
31 break; | 31 break; |
32 case IconLoader::NORMAL: | 32 case IconLoader::NORMAL: |
33 size_pixels = 32; | 33 size_pixels = 32; |
(...skipping 11 matching lines...) Expand all Loading... |
45 image = base::MakeUnique<gfx::Image>( | 45 image = base::MakeUnique<gfx::Image>( |
46 ui->GetIconForContentType(group_, size_pixels)); | 46 ui->GetIconForContentType(group_, size_pixels)); |
47 if (image->IsEmpty()) | 47 if (image->IsEmpty()) |
48 image = nullptr; | 48 image = nullptr; |
49 } | 49 } |
50 | 50 |
51 target_task_runner_->PostTask( | 51 target_task_runner_->PostTask( |
52 FROM_HERE, base::BindOnce(callback_, base::Passed(&image), group_)); | 52 FROM_HERE, base::BindOnce(callback_, base::Passed(&image), group_)); |
53 delete this; | 53 delete this; |
54 } | 54 } |
OLD | NEW |