summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/session_backend.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sessions/session_backend.cc')
-rw-r--r--chrome/browser/sessions/session_backend.cc21
1 files changed, 8 insertions, 13 deletions
diff --git a/chrome/browser/sessions/session_backend.cc b/chrome/browser/sessions/session_backend.cc
index 8540a79..7829d8b 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();