| Index: chrome/browser/browsing_data_database_helper.h
|
| diff --git a/chrome/browser/browsing_data_database_helper.h b/chrome/browser/browsing_data_database_helper.h
|
| index 62cc2d9f2809d0f0fc591b407bd4084a03530db7..2d3a8535cd36d2163e382ca9b537040f2d659092 100644
|
| --- a/chrome/browser/browsing_data_database_helper.h
|
| +++ b/chrome/browser/browsing_data_database_helper.h
|
| @@ -10,6 +10,7 @@
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| +#include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| #include "chrome/common/url_constants.h"
|
| @@ -57,7 +58,7 @@ class BrowsingDataDatabaseHelper
|
| // callback.
|
| // This must be called only in the UI thread.
|
| virtual void StartFetching(
|
| - Callback1<const std::list<DatabaseInfo>& >::Type* callback);
|
| + const base::Callback<void(const std::list<DatabaseInfo>&)>& callback);
|
|
|
| // Cancels the notification callback (i.e., the window that created it no
|
| // longer exists).
|
| @@ -80,8 +81,7 @@ class BrowsingDataDatabaseHelper
|
| std::list<DatabaseInfo> database_info_;
|
|
|
| // This only mutates on the UI thread.
|
| - scoped_ptr<Callback1<const std::list<DatabaseInfo>& >::Type >
|
| - completion_callback_;
|
| + base::Callback<void(const std::list<DatabaseInfo>&)> completion_callback_;
|
|
|
| // Indicates whether or not we're currently fetching information:
|
| // it's true when StartFetching() is called in the UI thread, and it's reset
|
| @@ -126,10 +126,11 @@ class CannedBrowsingDataDatabaseHelper : public BrowsingDataDatabaseHelper {
|
| // True if no databases are currently stored.
|
| bool empty() const;
|
|
|
| - // BrowsingDataDatabaseHelper methods.
|
| + // BrowsingDataDatabaseHelper implementation.
|
| virtual void StartFetching(
|
| - Callback1<const std::list<DatabaseInfo>& >::Type* callback);
|
| - virtual void CancelNotification() {}
|
| + const base::Callback<void(const std::list<DatabaseInfo>&)>& callback)
|
| + OVERRIDE;
|
| + virtual void CancelNotification() OVERRIDE {}
|
|
|
| private:
|
| struct PendingDatabaseInfo {
|
|
|