summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/file_reader.h
diff options
context:
space:
mode:
authoradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 21:59:09 +0000
committeradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 21:59:09 +0000
commit1ec27eb5b20f25e423b05d457c47115c296ce13d (patch)
tree9cf770570738227f8634e638619a5284d9820d03 /chrome/browser/extensions/file_reader.h
parent74861f3026520c2ca132e61df77e3daf94e37106 (diff)
downloadchromium_src-1ec27eb5b20f25e423b05d457c47115c296ce13d.zip
chromium_src-1ec27eb5b20f25e423b05d457c47115c296ce13d.tar.gz
chromium_src-1ec27eb5b20f25e423b05d457c47115c296ce13d.tar.bz2
base::Bind conversion for chrome/browser/extensions/file_reader.
Review URL: http://codereview.chromium.org/8343008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/file_reader.h')
-rw-r--r--chrome/browser/extensions/file_reader.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/extensions/file_reader.h b/chrome/browser/extensions/file_reader.h
index 4651260..63f2afa 100644
--- a/chrome/browser/extensions/file_reader.h
+++ b/chrome/browser/extensions/file_reader.h
@@ -8,7 +8,7 @@
#include <string>
-#include "base/callback_old.h"
+#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "chrome/common/extensions/extension_resource.h"
@@ -21,9 +21,9 @@ class MessageLoop;
class FileReader : public base::RefCountedThreadSafe<FileReader> {
public:
// Reports success or failure and the data of the file upon success.
- typedef Callback2<bool, const std::string&>::Type Callback;
+ typedef base::Callback<void(bool, const std::string&)> Callback;
- FileReader(const ExtensionResource& resource, Callback* callback);
+ FileReader(const ExtensionResource& resource, const Callback& callback);
// Called to start reading the file on a background thread. Upon completion,
// the callback will be notified of the results.
@@ -35,10 +35,9 @@ class FileReader : public base::RefCountedThreadSafe<FileReader> {
virtual ~FileReader();
void ReadFileOnBackgroundThread();
- void RunCallback(bool success, const std::string& data);
ExtensionResource resource_;
- Callback* callback_;
+ Callback callback_;
MessageLoop* origin_loop_;
};