Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1417)

Side by Side Diff: chrome/browser/icon_loader_auralinux.cc

Issue 2440273002: Clean up the IconLoader. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/icon_loader_android.cc ('k') | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/nix/mime_util_xdg.h" 9 #include "base/nix/mime_util_xdg.h"
10 #include "ui/views/linux_ui/linux_ui.h" 10 #include "ui/views/linux_ui/linux_ui.h"
11 11
12 // static 12 // static
13 IconGroupID IconLoader::ReadGroupIDFromFilepath( 13 IconLoader::IconGroup IconLoader::GroupForFilepath(
14 const base::FilePath& filepath) { 14 const base::FilePath& filepath) {
15 return base::nix::GetFileMimeType(filepath); 15 return base::nix::GetFileMimeType(filepath);
sky 2016/10/24 15:56:25 I believe this may trigger io: std::string GetFile
Avi (use Gerrit) 2016/10/24 16:02:18 :( Missed that platform. Let me try again.
16 } 16 }
17 17
18 // static 18 // static
19 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) {
20 return false;
21 }
22
23 // static
24 content::BrowserThread::ID IconLoader::ReadIconThreadID() { 19 content::BrowserThread::ID IconLoader::ReadIconThreadID() {
25 // ReadIcon() calls into views::LinuxUI and GTK2 code, so it must be on the UI 20 // ReadIcon() calls into views::LinuxUI and GTK2 code, so it must be on the UI
26 // thread. 21 // thread.
27 return content::BrowserThread::UI; 22 return content::BrowserThread::UI;
28 } 23 }
29 24
30 void IconLoader::ReadIcon() { 25 void IconLoader::ReadIcon() {
31 int size_pixels = 0; 26 int size_pixels = 0;
32 switch (icon_size_) { 27 switch (icon_size_) {
33 case IconLoader::SMALL: 28 case IconLoader::SMALL:
(...skipping 12 matching lines...) Expand all
46 views::LinuxUI* ui = views::LinuxUI::instance(); 41 views::LinuxUI* ui = views::LinuxUI::instance();
47 if (ui) { 42 if (ui) {
48 gfx::Image image = ui->GetIconForContentType(group_, size_pixels); 43 gfx::Image image = ui->GetIconForContentType(group_, size_pixels);
49 if (!image.IsEmpty()) 44 if (!image.IsEmpty())
50 image_.reset(new gfx::Image(image)); 45 image_.reset(new gfx::Image(image));
51 } 46 }
52 47
53 target_task_runner_->PostTask( 48 target_task_runner_->PostTask(
54 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); 49 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
55 } 50 }
OLDNEW
« no previous file with comments | « chrome/browser/icon_loader_android.cc ('k') | chrome/browser/icon_loader_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698