Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(417)

Unified Diff: chrome/browser/password_manager/password_store_win.cc

Issue 1874001: Migrate web data service logins to the login database correctly on win. (Closed)
Patch Set: Fix PSW::OnWeb Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/password_manager/password_store_win.cc
diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
index 3280f40113907a3050ac87526123023dd95cf1a1..a62a19a3ceba8b5344cc376743d3d6d3edcf986d 100644
--- a/chrome/browser/password_manager/password_store_win.cc
+++ b/chrome/browser/password_manager/password_store_win.cc
@@ -55,16 +55,17 @@ void PasswordStoreWin::NotifyConsumer(GetLoginsRequest* request,
}
void PasswordStoreWin::OnWebDataServiceRequestDone(
- WebDataService::Handle handle, const WDTypedResult *result) {
- scoped_ptr<GetLoginsRequest> request(TakeRequestWithHandle(handle));
- // If the request was cancelled, we are done.
- if (!request.get())
- return;
-
+ WebDataService::Handle handle, const WDTypedResult* result) {
if (!result)
return; // The WDS returns NULL if it is shutting down.
if (PASSWORD_IE7_RESULT == result->GetType()) {
+ scoped_ptr<GetLoginsRequest> request(TakeRequestWithHandle(handle));
+
+ // If the request was cancelled, we are done.
+ if (!request.get())
+ return;
+
// This is a response from WebDataService::GetIE7Login.
PendingRequestFormMap::iterator it(pending_request_forms_.find(
request->handle));
@@ -78,7 +79,7 @@ void PasswordStoreWin::OnWebDataServiceRequestDone(
pending_request_forms_.erase(it);
PasswordStore::NotifyConsumer(request.release(), forms);
} else {
- NOTREACHED();
+ PasswordStoreDefault::OnWebDataServiceRequestDone(handle, result);
}
}

Powered by Google App Engine
This is Rietveld 408576698