diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-24 17:17:55 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-24 17:17:55 +0000 |
| commit | 2d507dc02c5b70fe241ac353de7cd57635e28bc5 (patch) | |
| tree | 942e18f731b768268aa2f984fcd06cbc4afce75c /chrome | |
| parent | 4c25bc4d870be25f0e4f306f1aa95c86634be34c (diff) | |
| download | chromium_src-2d507dc02c5b70fe241ac353de7cd57635e28bc5.zip chromium_src-2d507dc02c5b70fe241ac353de7cd57635e28bc5.tar.gz chromium_src-2d507dc02c5b70fe241ac353de7cd57635e28bc5.tar.bz2 | |
Fixes bogus typedef for HistoryService's empty callback. This turned
up as an UMR. I'm surprised this didn't produce a compiler error.
BUG=1338601
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/bookmark_bar_model.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/bookmark_bar_model.h | 2 | ||||
| -rw-r--r-- | chrome/browser/history/history.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/bookmark_bar_model.cc b/chrome/browser/bookmark_bar_model.cc index e8f8a0b..3aa6e26 100644 --- a/chrome/browser/bookmark_bar_model.cc +++ b/chrome/browser/bookmark_bar_model.cc @@ -377,7 +377,7 @@ void BookmarkBarModel::OnBookmarkStorageLoadedBookmarks( NewCallback(this, &BookmarkBarModel::OnHistoryDone)); } -void BookmarkBarModel::OnHistoryDone(HistoryService::Handle handle) { +void BookmarkBarModel::OnHistoryDone() { if (loaded_) { NOTREACHED(); return; diff --git a/chrome/browser/bookmark_bar_model.h b/chrome/browser/bookmark_bar_model.h index 09e8f82..c4c3bd6 100644 --- a/chrome/browser/bookmark_bar_model.h +++ b/chrome/browser/bookmark_bar_model.h @@ -301,7 +301,7 @@ class BookmarkBarModel : public NotificationObserver { // Callback from history that it is done with an empty request. This is used // if there is no bookmarks file. Once done, we attempt to load from the // temporary file creating during migration. - void OnHistoryDone(HistoryService::Handle handle); + void OnHistoryDone(); // Invoked when loading is finished. Sets loaded_ and notifies observers. void DoneLoading(); diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index fe18d79..ec42335 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -496,7 +496,7 @@ class HistoryService : public CancelableRequestProvider, Handle ScheduleDBTask(HistoryDBTask* task, CancelableRequestConsumerBase* consumer); - typedef Callback1<Handle>::Type EmptyHistoryCallback; + typedef Callback0::Type EmptyHistoryCallback; // Schedules a task that does nothing on the backend. This can be used to get // notification when then history backend is done processing requests. |