| 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 "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
| 9 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
| 10 | 11 |
| 11 #if defined(TOOLKIT_USES_GTK) | 12 #if defined(TOOLKIT_USES_GTK) |
| 12 #include "base/nix/mime_util_xdg.h" | 13 #include "base/nix/mime_util_xdg.h" |
| 13 #endif | 14 #endif |
| 14 | 15 |
| 15 using content::BrowserThread; | 16 using content::BrowserThread; |
| 16 | 17 |
| 17 IconLoader::IconLoader(const IconGroupID& group, IconSize size, | 18 IconLoader::IconLoader(const IconGroupID& group, IconSize size, |
| (...skipping 10 matching lines...) Expand all Loading... |
| 28 | 29 |
| 29 void IconLoader::Start() { | 30 void IconLoader::Start() { |
| 30 target_message_loop_ = base::MessageLoopProxy::current(); | 31 target_message_loop_ = base::MessageLoopProxy::current(); |
| 31 | 32 |
| 32 #if defined(TOOLKIT_USES_GTK) | 33 #if defined(TOOLKIT_USES_GTK) |
| 33 // This call must happen on the UI thread before we can start loading icons. | 34 // This call must happen on the UI thread before we can start loading icons. |
| 34 base::nix::DetectGtkTheme(); | 35 base::nix::DetectGtkTheme(); |
| 35 #endif | 36 #endif |
| 36 | 37 |
| 37 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, | 38 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| 38 NewRunnableMethod(this, &IconLoader::ReadIcon)); | 39 base::Bind(&IconLoader::ReadIcon, this)); |
| 39 } | 40 } |
| 40 | 41 |
| 41 void IconLoader::NotifyDelegate() { | 42 void IconLoader::NotifyDelegate() { |
| 42 // If the delegate takes ownership of the Image, release it from the scoped | 43 // If the delegate takes ownership of the Image, release it from the scoped |
| 43 // pointer. | 44 // pointer. |
| 44 if (delegate_->OnImageLoaded(this, image_.get())) | 45 if (delegate_->OnImageLoaded(this, image_.get())) |
| 45 ignore_result(image_.release()); // Can't ignore return value. | 46 ignore_result(image_.release()); // Can't ignore return value. |
| 46 } | 47 } |
| OLD | NEW |