| 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 #import <AppKit/AppKit.h> | 7 #import <AppKit/AppKit.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 12 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
| 13 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
| 14 #include "ui/gfx/image/image_skia.h" | 14 #include "ui/gfx/image/image_skia.h" |
| 15 #include "ui/gfx/image/image_skia_util_mac.h" | 15 #include "ui/gfx/image/image_skia_util_mac.h" |
| 16 | 16 |
| 17 // static | 17 // static |
| 18 IconGroupID IconLoader::ReadGroupIDFromFilepath( | 18 IconLoader::IconGroup IconLoader::GroupForFilepath( |
| 19 const base::FilePath& filepath) { | 19 const base::FilePath& file_path) { |
| 20 return filepath.Extension(); | 20 return file_path.Extension(); |
| 21 } | 21 } |
| 22 | 22 |
| 23 // static | 23 // static |
| 24 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) { | |
| 25 return false; | |
| 26 } | |
| 27 | |
| 28 // static | |
| 29 content::BrowserThread::ID IconLoader::ReadIconThreadID() { | 24 content::BrowserThread::ID IconLoader::ReadIconThreadID() { |
| 30 return content::BrowserThread::FILE; | 25 return content::BrowserThread::FILE; |
| 31 } | 26 } |
| 32 | 27 |
| 33 void IconLoader::ReadIcon() { | 28 void IconLoader::ReadIcon() { |
| 34 NSString* group = base::SysUTF8ToNSString(group_); | 29 NSString* group = base::SysUTF8ToNSString(group_); |
| 35 NSWorkspace* workspace = [NSWorkspace sharedWorkspace]; | 30 NSWorkspace* workspace = [NSWorkspace sharedWorkspace]; |
| 36 NSImage* icon = [workspace iconForFileType:group]; | 31 NSImage* icon = [workspace iconForFileType:group]; |
| 37 | 32 |
| 38 if (icon_size_ == ALL) { | 33 if (icon_size_ == ALL) { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 53 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size)); | 48 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size)); |
| 54 if (!image_skia.isNull()) { | 49 if (!image_skia.isNull()) { |
| 55 image_skia.MakeThreadSafe(); | 50 image_skia.MakeThreadSafe(); |
| 56 image_.reset(new gfx::Image(image_skia)); | 51 image_.reset(new gfx::Image(image_skia)); |
| 57 } | 52 } |
| 58 } | 53 } |
| 59 | 54 |
| 60 target_task_runner_->PostTask(FROM_HERE, | 55 target_task_runner_->PostTask(FROM_HERE, |
| 61 base::Bind(&IconLoader::NotifyDelegate, this)); | 56 base::Bind(&IconLoader::NotifyDelegate, this)); |
| 62 } | 57 } |
| OLD | NEW |