Index: chrome/browser/sessions/session_backend.cc |
diff --git a/chrome/browser/sessions/session_backend.cc b/chrome/browser/sessions/session_backend.cc |
index 8540a791ba9a06d52d369251e23332ebb2c7909a..7829d8bfe2c531ffd558d3a0e0a6a39c5592f94b 100644 |
--- a/chrome/browser/sessions/session_backend.cc |
+++ b/chrome/browser/sessions/session_backend.cc |
@@ -244,12 +244,16 @@ void SessionBackend::AppendCommands( |
} |
void SessionBackend::ReadLastSessionCommands( |
- scoped_refptr<BaseSessionService::InternalGetCommandsRequest> request) { |
- if (request->canceled()) |
+ const CancelableTaskTracker::IsCanceledCallback& is_canceled, |
+ const BaseSessionService::InternalGetCommandsCallback& callback) { |
+ if (is_canceled.Run()) |
return; |
+ |
Init(); |
- ReadLastSessionCommandsImpl(&(request->commands)); |
- request->ForwardResult(request->handle(), request); |
+ |
+ ScopedVector<SessionCommand> commands; |
+ ReadLastSessionCommandsImpl(&(commands.get())); |
+ callback.Run(commands.Pass()); |
} |
bool SessionBackend::ReadLastSessionCommandsImpl( |
@@ -294,15 +298,6 @@ void SessionBackend::MoveCurrentSessionToLastSession() { |
ResetFile(); |
} |
-void SessionBackend::ReadCurrentSessionCommands( |
- scoped_refptr<BaseSessionService::InternalGetCommandsRequest> request) { |
- if (request->canceled()) |
- return; |
- Init(); |
- ReadCurrentSessionCommandsImpl(&(request->commands)); |
- request->ForwardResult(request->handle(), request); |
-} |
- |
bool SessionBackend::ReadCurrentSessionCommandsImpl( |
std::vector<SessionCommand*>* commands) { |
Init(); |