| Index: chrome/browser/icon_loader.h
|
| diff --git a/chrome/browser/icon_loader.h b/chrome/browser/icon_loader.h
|
| index ff22c7a056c8995ca6952fbac554d5263c05e70e..e06aa5a7a622a62de6e74602965e25b3eedef399 100644
|
| --- a/chrome/browser/icon_loader.h
|
| +++ b/chrome/browser/icon_loader.h
|
| @@ -10,6 +10,7 @@
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/file_path.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop_proxy.h"
|
| @@ -50,7 +51,9 @@ class IconLoader : public base::RefCountedThreadSafe<IconLoader> {
|
| virtual ~Delegate() {}
|
| };
|
|
|
| - IconLoader(const IconGroupID& group, IconSize size, Delegate* delegate);
|
| + IconLoader(const base::FilePath& file_path,
|
| + IconSize size,
|
| + Delegate* delegate);
|
|
|
| // Start reading the icon on the file thread.
|
| void Start();
|
| @@ -60,14 +63,15 @@ class IconLoader : public base::RefCountedThreadSafe<IconLoader> {
|
|
|
| virtual ~IconLoader();
|
|
|
| - void ReadIcon();
|
| + void ReadIcon(const IconGroupID& group);
|
| + void ReadGroupAndIcon();
|
|
|
| void NotifyDelegate();
|
|
|
| // The message loop object of the thread in which we notify the delegate.
|
| scoped_refptr<base::MessageLoopProxy> target_message_loop_;
|
|
|
| - IconGroupID group_;
|
| + base::FilePath file_path_;
|
|
|
| IconSize icon_size_;
|
|
|
|
|