diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/icon_loader.h | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/icon_loader.h')
| -rw-r--r-- | chrome/browser/icon_loader.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/icon_loader.h b/chrome/browser/icon_loader.h index 32b4048..8d055e3 100644 --- a/chrome/browser/icon_loader.h +++ b/chrome/browser/icon_loader.h @@ -11,10 +11,13 @@ #include <string> #include "base/basictypes.h" +#include "base/message_loop_proxy.h" +#include "base/ref_counted.h" +#include "gfx/scoped_image.h" + #if defined(TOOLKIT_USES_GTK) #include "base/file_path.h" #endif -#include "base/ref_counted.h" #if defined(OS_WIN) // On Windows, we group files by their extension, with several exceptions: @@ -68,13 +71,13 @@ class IconLoader : public base::RefCountedThreadSafe<IconLoader> { void NotifyDelegate(); // The message loop object of the thread in which we notify the delegate. - MessageLoop* target_message_loop_; + scoped_refptr<base::MessageLoopProxy> target_message_loop_; IconGroupID group_; IconSize icon_size_; - SkBitmap* bitmap_; + gfx::ScopedImage<SkBitmap> bitmap_; Delegate* delegate_; |