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

Side by Side Diff: chrome/browser/icon_loader_mac.mm

Issue 13812014: Added check for icons that change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from review. Created 7 years, 8 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
« no previous file with comments | « chrome/browser/icon_loader_linux.cc ('k') | chrome/browser/icon_loader_win.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 (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.h" 11 #include "base/message_loop.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "base/strings/sys_string_conversions.h" 13 #include "base/strings/sys_string_conversions.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 IconGroupID IconLoader::ReadGroupIDFromFilepath(
19 const base::FilePath& filepath) { 19 const base::FilePath& filepath) {
20 return filepath.Extension(); 20 return filepath.Extension();
21 } 21 }
22 22
23 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) {
24 return false;
25 }
26
23 void IconLoader::ReadIcon() { 27 void IconLoader::ReadIcon() {
24 NSString* group = base::SysUTF8ToNSString(group_); 28 NSString* group = base::SysUTF8ToNSString(group_);
25 NSWorkspace* workspace = [NSWorkspace sharedWorkspace]; 29 NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
26 NSImage* icon = [workspace iconForFileType:group]; 30 NSImage* icon = [workspace iconForFileType:group];
27 31
28 if (icon_size_ == ALL) { 32 if (icon_size_ == ALL) {
29 // The NSImage already has all sizes. 33 // The NSImage already has all sizes.
30 image_.reset(new gfx::Image([icon retain])); 34 image_.reset(new gfx::Image([icon retain]));
31 } else { 35 } else {
32 NSSize size = NSZeroSize; 36 NSSize size = NSZeroSize;
(...skipping 10 matching lines...) Expand all
43 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size)); 47 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size));
44 if (!image_skia.isNull()) { 48 if (!image_skia.isNull()) {
45 image_skia.MakeThreadSafe(); 49 image_skia.MakeThreadSafe();
46 image_.reset(new gfx::Image(image_skia)); 50 image_.reset(new gfx::Image(image_skia));
47 } 51 }
48 } 52 }
49 53
50 target_message_loop_->PostTask(FROM_HERE, 54 target_message_loop_->PostTask(FROM_HERE,
51 base::Bind(&IconLoader::NotifyDelegate, this)); 55 base::Bind(&IconLoader::NotifyDelegate, this));
52 } 56 }
OLDNEW
« no previous file with comments | « chrome/browser/icon_loader_linux.cc ('k') | chrome/browser/icon_loader_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698