| 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" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 default: | 50 default: |
| 51 NOTREACHED(); | 51 NOTREACHED(); |
| 52 } | 52 } |
| 53 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size)); | 53 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size)); |
| 54 if (!image_skia.isNull()) { | 54 if (!image_skia.isNull()) { |
| 55 image_skia.MakeThreadSafe(); | 55 image_skia.MakeThreadSafe(); |
| 56 image_.reset(new gfx::Image(image_skia)); | 56 image_.reset(new gfx::Image(image_skia)); |
| 57 } | 57 } |
| 58 } | 58 } |
| 59 | 59 |
| 60 target_message_loop_->PostTask(FROM_HERE, | 60 target_task_runner_->PostTask(FROM_HERE, |
| 61 base::Bind(&IconLoader::NotifyDelegate, this)); | 61 base::Bind(&IconLoader::NotifyDelegate, this)); |
| 62 } | 62 } |
| OLD | NEW |