OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/password_manager/password_store_win.h" | 5 #include "chrome/browser/password_manager/password_store_win.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/profiler/scoped_profile.h" |
12 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
14 #include "components/os_crypt/ie7_password_win.h" | 15 #include "components/os_crypt/ie7_password_win.h" |
15 #include "components/password_manager/core/browser/password_manager.h" | 16 #include "components/password_manager/core/browser/password_manager.h" |
16 #include "components/password_manager/core/browser/webdata/password_web_data_ser
vice_win.h" | 17 #include "components/password_manager/core/browser/webdata/password_web_data_ser
vice_win.h" |
17 #include "content/public/browser/browser_thread.h" | 18 #include "content/public/browser/browser_thread.h" |
18 | 19 |
19 using autofill::PasswordForm; | 20 using autofill::PasswordForm; |
20 using content::BrowserThread; | 21 using content::BrowserThread; |
21 using password_manager::PasswordStoreDefault; | 22 using password_manager::PasswordStoreDefault; |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 password_store_->AddLoginImpl(*autofill); | 136 password_store_->AddLoginImpl(*autofill); |
136 } | 137 } |
137 } | 138 } |
138 } | 139 } |
139 return matching_forms; | 140 return matching_forms; |
140 } | 141 } |
141 | 142 |
142 void PasswordStoreWin::DBHandler::OnWebDataServiceRequestDone( | 143 void PasswordStoreWin::DBHandler::OnWebDataServiceRequestDone( |
143 PasswordWebDataService::Handle handle, | 144 PasswordWebDataService::Handle handle, |
144 const WDTypedResult* result) { | 145 const WDTypedResult* result) { |
| 146 // TODO(vadimt): Remove ScopedProfile below once crbug.com/422460 is fixed. |
| 147 tracked_objects::ScopedProfile tracking_profile( |
| 148 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 149 "422460 PasswordStoreWin::DBHandler::OnWebDataServiceRequestDone")); |
| 150 |
145 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); | 151 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); |
146 | 152 |
147 PendingRequestMap::iterator i = pending_requests_.find(handle); | 153 PendingRequestMap::iterator i = pending_requests_.find(handle); |
148 DCHECK(i != pending_requests_.end()); | 154 DCHECK(i != pending_requests_.end()); |
149 | 155 |
150 scoped_ptr<PasswordForm> form(i->second.form); | 156 scoped_ptr<PasswordForm> form(i->second.form); |
151 PasswordStoreWin::ConsumerCallbackRunner callback_runner( | 157 PasswordStoreWin::ConsumerCallbackRunner callback_runner( |
152 i->second.callback_runner); | 158 i->second.callback_runner); |
153 pending_requests_.erase(i); | 159 pending_requests_.erase(i); |
154 | 160 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 | 213 |
208 void PasswordStoreWin::GetLoginsImpl( | 214 void PasswordStoreWin::GetLoginsImpl( |
209 const PasswordForm& form, | 215 const PasswordForm& form, |
210 AuthorizationPromptPolicy prompt_policy, | 216 AuthorizationPromptPolicy prompt_policy, |
211 const ConsumerCallbackRunner& callback_runner) { | 217 const ConsumerCallbackRunner& callback_runner) { |
212 ConsumerCallbackRunner get_ie7_login = | 218 ConsumerCallbackRunner get_ie7_login = |
213 base::Bind(&PasswordStoreWin::GetIE7LoginIfNecessary, | 219 base::Bind(&PasswordStoreWin::GetIE7LoginIfNecessary, |
214 this, form, callback_runner); | 220 this, form, callback_runner); |
215 PasswordStoreDefault::GetLoginsImpl(form, prompt_policy, get_ie7_login); | 221 PasswordStoreDefault::GetLoginsImpl(form, prompt_policy, get_ie7_login); |
216 } | 222 } |
OLD | NEW |