| 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/ui/login/login_prompt.h" | 5 #include "chrome/browser/ui/login/login_prompt.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 // manager, but still needs to be able to show login prompts. | 140 // manager, but still needs to be able to show login prompts. |
| 141 if (guest_view::GuestViewBase::FromWebContents(parent_contents)) { | 141 if (guest_view::GuestViewBase::FromWebContents(parent_contents)) { |
| 142 handler->BuildViewWithoutPasswordManager(explanation); | 142 handler->BuildViewWithoutPasswordManager(explanation); |
| 143 return; | 143 return; |
| 144 } | 144 } |
| 145 #endif | 145 #endif |
| 146 handler->CancelAuth(); | 146 handler->CancelAuth(); |
| 147 return; | 147 return; |
| 148 } | 148 } |
| 149 | 149 |
| 150 if (password_manager && password_manager->client()->IsLoggingActive()) { | 150 if (password_manager && password_manager->IsLoggingActive()) { |
| 151 password_manager::BrowserSavePasswordProgressLogger logger( | 151 password_manager::BrowserSavePasswordProgressLogger logger( |
| 152 password_manager->client()); | 152 password_manager->client()->GetPasswordManager()); |
| 153 logger.LogMessage( | 153 logger.LogMessage( |
| 154 autofill::SavePasswordProgressLogger::STRING_SHOW_LOGIN_PROMPT_METHOD); | 154 autofill::SavePasswordProgressLogger::STRING_SHOW_LOGIN_PROMPT_METHOD); |
| 155 } | 155 } |
| 156 | 156 |
| 157 PasswordForm observed_form( | 157 PasswordForm observed_form( |
| 158 MakeInputForPasswordManager(request_url, auth_info)); | 158 MakeInputForPasswordManager(request_url, auth_info)); |
| 159 handler->BuildViewWithPasswordManager(explanation, password_manager, | 159 handler->BuildViewWithPasswordManager(explanation, password_manager, |
| 160 observed_form); | 160 observed_form); |
| 161 } | 161 } |
| 162 | 162 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 password_manager::PasswordManagerClient* client = | 239 password_manager::PasswordManagerClient* client = |
| 240 ChromePasswordManagerClient::FromWebContents(GetWebContentsForLogin()); | 240 ChromePasswordManagerClient::FromWebContents(GetWebContentsForLogin()); |
| 241 return client ? client->GetPasswordManager() : nullptr; | 241 return client ? client->GetPasswordManager() : nullptr; |
| 242 } | 242 } |
| 243 | 243 |
| 244 void LoginHandler::SetAuth(const base::string16& username, | 244 void LoginHandler::SetAuth(const base::string16& username, |
| 245 const base::string16& password) { | 245 const base::string16& password) { |
| 246 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 246 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 247 | 247 |
| 248 scoped_ptr<password_manager::BrowserSavePasswordProgressLogger> logger; | 248 scoped_ptr<password_manager::BrowserSavePasswordProgressLogger> logger; |
| 249 if (password_manager_ && password_manager_->client()->IsLoggingActive()) { | 249 if (password_manager_ && password_manager_->IsLoggingActive()) { |
| 250 logger.reset(new password_manager::BrowserSavePasswordProgressLogger( | 250 logger.reset(new password_manager::BrowserSavePasswordProgressLogger( |
| 251 password_manager_->client())); | 251 password_manager_->client()->GetPasswordManager())); |
| 252 logger->LogMessage( | 252 logger->LogMessage( |
| 253 autofill::SavePasswordProgressLogger::STRING_SET_AUTH_METHOD); | 253 autofill::SavePasswordProgressLogger::STRING_SET_AUTH_METHOD); |
| 254 } | 254 } |
| 255 | 255 |
| 256 bool already_handled = TestAndSetAuthHandled(); | 256 bool already_handled = TestAndSetAuthHandled(); |
| 257 if (logger) { | 257 if (logger) { |
| 258 logger->LogBoolean( | 258 logger->LogBoolean( |
| 259 autofill::SavePasswordProgressLogger::STRING_AUTHENTICATION_HANDLED, | 259 autofill::SavePasswordProgressLogger::STRING_AUTHENTICATION_HANDLED, |
| 260 already_handled); | 260 already_handled); |
| 261 } | 261 } |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 signon_realm = auth_info.challenger.ToString(); | 620 signon_realm = auth_info.challenger.ToString(); |
| 621 signon_realm.append("/"); | 621 signon_realm.append("/"); |
| 622 } else { | 622 } else { |
| 623 // Take scheme, host, and port from the url. | 623 // Take scheme, host, and port from the url. |
| 624 signon_realm = url.GetOrigin().spec(); | 624 signon_realm = url.GetOrigin().spec(); |
| 625 // This ends with a "/". | 625 // This ends with a "/". |
| 626 } | 626 } |
| 627 signon_realm.append(auth_info.realm); | 627 signon_realm.append(auth_info.realm); |
| 628 return signon_realm; | 628 return signon_realm; |
| 629 } | 629 } |
| OLD | NEW |