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

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

Issue 192883004: linux_aura: run IconLoader::ReadIcon on the UI thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/icon_loader_chromeos.cc ('k') | chrome/browser/icon_loader_mac.mm » ('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 (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 <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/nix/mime_util_xdg.h" 13 #include "base/nix/mime_util_xdg.h"
14 #include "third_party/skia/include/core/SkBitmap.h" 14 #include "third_party/skia/include/core/SkBitmap.h"
15 #include "ui/gfx/codec/png_codec.h" 15 #include "ui/gfx/codec/png_codec.h"
16 #include "ui/gfx/image/image_skia.h" 16 #include "ui/gfx/image/image_skia.h"
17 #include "ui/gfx/size.h" 17 #include "ui/gfx/size.h"
18 18
19 using std::string; 19 using std::string;
20 20
21 // static 21 // static
22 IconGroupID IconLoader::ReadGroupIDFromFilepath( 22 IconGroupID IconLoader::ReadGroupIDFromFilepath(
23 const base::FilePath& filepath) { 23 const base::FilePath& filepath) {
24 return base::nix::GetFileMimeType(filepath); 24 return base::nix::GetFileMimeType(filepath);
25 } 25 }
26 26
27 // static
27 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) { 28 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) {
28 return false; 29 return false;
29 } 30 }
30 31
32 // static
33 content::BrowserThread::ID IconLoader::ReadIconThreadID() {
34 return content::BrowserThread::FILE;
Nico 2014/03/11 16:26:19 Isn't icon_loader_linux gtk too? Why would linux/a
davidben 2014/03/11 16:37:13 It's a little bizarre since linux/aura is more nat
35 }
36
31 void IconLoader::ReadIcon() { 37 void IconLoader::ReadIcon() {
32 int size_pixels = 0; 38 int size_pixels = 0;
33 switch (icon_size_) { 39 switch (icon_size_) {
34 case IconLoader::SMALL: 40 case IconLoader::SMALL:
35 size_pixels = 16; 41 size_pixels = 16;
36 break; 42 break;
37 case IconLoader::NORMAL: 43 case IconLoader::NORMAL:
38 size_pixels = 32; 44 size_pixels = 32;
39 break; 45 break;
40 case IconLoader::LARGE: 46 case IconLoader::LARGE:
(...skipping 24 matching lines...) Expand all
65 image_.reset(new gfx::Image(image_skia)); 71 image_.reset(new gfx::Image(image_skia));
66 } else { 72 } else {
67 LOG(WARNING) << "Unsupported file type or load error: " 73 LOG(WARNING) << "Unsupported file type or load error: "
68 << filename.value(); 74 << filename.value();
69 } 75 }
70 } 76 }
71 77
72 target_message_loop_->PostTask( 78 target_message_loop_->PostTask(
73 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); 79 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
74 } 80 }
OLDNEW
« no previous file with comments | « chrome/browser/icon_loader_chromeos.cc ('k') | chrome/browser/icon_loader_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698