| 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/file_path.h" |
| 10 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
| 11 #include "base/threading/thread.h" | 12 #include "base/threading/thread.h" |
| 12 #include "base/sys_string_conversions.h" | 13 #include "base/sys_string_conversions.h" |
| 13 #include "ui/gfx/image/image_skia.h" | 14 #include "ui/gfx/image/image_skia.h" |
| 14 #include "ui/gfx/image/image_skia_util_mac.h" | 15 #include "ui/gfx/image/image_skia_util_mac.h" |
| 15 | 16 |
| 17 IconGroupID IconManager::ReadGroupIDFromFilepath( |
| 18 const base::FilePath& filepath) { |
| 19 return filepath.Extension(); |
| 20 } |
| 21 |
| 16 void IconLoader::ReadIcon() { | 22 void IconLoader::ReadIcon() { |
| 17 NSString* group = base::SysUTF8ToNSString(group_); | 23 NSString* group = base::SysUTF8ToNSString(group_); |
| 18 NSWorkspace* workspace = [NSWorkspace sharedWorkspace]; | 24 NSWorkspace* workspace = [NSWorkspace sharedWorkspace]; |
| 19 NSImage* icon = [workspace iconForFileType:group]; | 25 NSImage* icon = [workspace iconForFileType:group]; |
| 20 | 26 |
| 21 if (icon_size_ == ALL) { | 27 if (icon_size_ == ALL) { |
| 22 // The NSImage already has all sizes. | 28 // The NSImage already has all sizes. |
| 23 image_.reset(new gfx::Image([icon retain])); | 29 image_.reset(new gfx::Image([icon retain])); |
| 24 } else { | 30 } else { |
| 25 NSSize size = NSZeroSize; | 31 NSSize size = NSZeroSize; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 36 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size)); | 42 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size)); |
| 37 if (!image_skia.isNull()) { | 43 if (!image_skia.isNull()) { |
| 38 image_skia.MakeThreadSafe(); | 44 image_skia.MakeThreadSafe(); |
| 39 image_.reset(new gfx::Image(image_skia)); | 45 image_.reset(new gfx::Image(image_skia)); |
| 40 } | 46 } |
| 41 } | 47 } |
| 42 | 48 |
| 43 target_message_loop_->PostTask(FROM_HERE, | 49 target_message_loop_->PostTask(FROM_HERE, |
| 44 base::Bind(&IconLoader::NotifyDelegate, this)); | 50 base::Bind(&IconLoader::NotifyDelegate, this)); |
| 45 } | 51 } |
| OLD | NEW |