| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/passwords/manage_passwords_ui_controller.h" | 5 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 9 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
| 10 #include "chrome/browser/password_manager/chrome_password_manager_client.h" | 10 #include "chrome/browser/password_manager/chrome_password_manager_client.h" |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 } | 381 } |
| 382 | 382 |
| 383 void ManagePasswordsUIController::OnNopeUpdateClicked() { | 383 void ManagePasswordsUIController::OnNopeUpdateClicked() { |
| 384 password_manager::PasswordFormManager* form_manager = | 384 password_manager::PasswordFormManager* form_manager = |
| 385 passwords_data_.form_manager(); | 385 passwords_data_.form_manager(); |
| 386 DCHECK(form_manager); | 386 DCHECK(form_manager); |
| 387 form_manager->OnNopeUpdateClicked(); | 387 form_manager->OnNopeUpdateClicked(); |
| 388 } | 388 } |
| 389 | 389 |
| 390 void ManagePasswordsUIController::OnNoInteractionOnUpdate() { | 390 void ManagePasswordsUIController::OnNoInteractionOnUpdate() { |
| 391 if (state() != password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) { |
| 392 // Do nothing if the state was changed. It can happen for example when the |
| 393 // update bubble is active and a page navigation happens. |
| 394 return; |
| 395 } |
| 391 password_manager::PasswordFormManager* form_manager = | 396 password_manager::PasswordFormManager* form_manager = |
| 392 passwords_data_.form_manager(); | 397 passwords_data_.form_manager(); |
| 393 DCHECK(form_manager); | 398 DCHECK(form_manager); |
| 394 form_manager->OnNoInteractionOnUpdate(); | 399 form_manager->OnNoInteractionOnUpdate(); |
| 395 } | 400 } |
| 396 | 401 |
| 397 void ManagePasswordsUIController::OnBubbleHidden() { | 402 void ManagePasswordsUIController::OnBubbleHidden() { |
| 398 // Avoid using |state()| which is overridden for some unit tests. | 403 // Avoid using |state()| which is overridden for some unit tests. |
| 399 if (state() == password_manager::ui::CREDENTIAL_REQUEST_STATE || | 404 if (state() == password_manager::ui::CREDENTIAL_REQUEST_STATE || |
| 400 state() == password_manager::ui::CONFIRMATION_STATE || | 405 state() == password_manager::ui::CONFIRMATION_STATE || |
| (...skipping 18 matching lines...) Expand all Loading... |
| 419 updater->ExecuteCommand(IDC_MANAGE_PASSWORDS_FOR_PAGE); | 424 updater->ExecuteCommand(IDC_MANAGE_PASSWORDS_FOR_PAGE); |
| 420 #endif | 425 #endif |
| 421 } | 426 } |
| 422 | 427 |
| 423 void ManagePasswordsUIController::WebContentsDestroyed() { | 428 void ManagePasswordsUIController::WebContentsDestroyed() { |
| 424 password_manager::PasswordStore* password_store = | 429 password_manager::PasswordStore* password_store = |
| 425 GetPasswordStore(web_contents()); | 430 GetPasswordStore(web_contents()); |
| 426 if (password_store) | 431 if (password_store) |
| 427 password_store->RemoveObserver(this); | 432 password_store->RemoveObserver(this); |
| 428 } | 433 } |
| OLD | NEW |