summaryrefslogtreecommitdiffstats
path: root/chrome/browser/icon_loader.h
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 13:58:57 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 13:58:57 +0000
commit982735c278476e99b504feaa775fa7b3c0fd8fa8 (patch)
treeb6949930607de82a62e3eb7f20a0748f3794b4c4 /chrome/browser/icon_loader.h
parent2722dd04f58683556bfcaf1db6b79b1b95b9b93f (diff)
downloadchromium_src-982735c278476e99b504feaa775fa7b3c0fd8fa8.zip
chromium_src-982735c278476e99b504feaa775fa7b3c0fd8fa8.tar.gz
chromium_src-982735c278476e99b504feaa775fa7b3c0fd8fa8.tar.bz2
Convert IconLoader to use gfx::ScopedImage<> and other hygiene fixes.
BUG=none TEST=compile/automated tests Review URL: http://codereview.chromium.org/4121008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_loader.h')
-rw-r--r--chrome/browser/icon_loader.h9
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_;