OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
10 #include "third_party/skia/include/core/SkBitmap.h" | |
11 | 10 |
12 #if defined(TOOLKIT_GTK) | 11 #if defined(TOOLKIT_GTK) |
13 #include "base/nix/mime_util_xdg.h" | 12 #include "base/nix/mime_util_xdg.h" |
14 #endif | 13 #endif |
15 | 14 |
16 using content::BrowserThread; | 15 using content::BrowserThread; |
17 | 16 |
18 IconLoader::IconLoader(const IconGroupID& group, IconSize size, | 17 IconLoader::IconLoader(const IconGroupID& group, IconSize size, |
19 Delegate* delegate) | 18 Delegate* delegate) |
20 : target_message_loop_(NULL), | 19 : target_message_loop_(NULL), |
(...skipping 17 matching lines...) Expand all Loading... |
38 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, | 37 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
39 base::Bind(&IconLoader::ReadIcon, this)); | 38 base::Bind(&IconLoader::ReadIcon, this)); |
40 } | 39 } |
41 | 40 |
42 void IconLoader::NotifyDelegate() { | 41 void IconLoader::NotifyDelegate() { |
43 // If the delegate takes ownership of the Image, release it from the scoped | 42 // If the delegate takes ownership of the Image, release it from the scoped |
44 // pointer. | 43 // pointer. |
45 if (delegate_->OnImageLoaded(this, image_.get())) | 44 if (delegate_->OnImageLoaded(this, image_.get())) |
46 ignore_result(image_.release()); // Can't ignore return value. | 45 ignore_result(image_.release()); // Can't ignore return value. |
47 } | 46 } |
OLD | NEW |