Chromium Code Reviews| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" | 9 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" |
| 10 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" | 10 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 | 44 |
| 45 base::TimeDelta Elapsed() const override; | 45 base::TimeDelta Elapsed() const override; |
| 46 void SetElapsed(base::TimeDelta elapsed) { elapsed_ = elapsed; } | 46 void SetElapsed(base::TimeDelta elapsed) { elapsed_ = elapsed; } |
| 47 bool opened_bubble() const { return opened_bubble_; } | 47 bool opened_bubble() const { return opened_bubble_; } |
| 48 | 48 |
| 49 using ManagePasswordsUIController::DidNavigateMainFrame; | 49 using ManagePasswordsUIController::DidNavigateMainFrame; |
| 50 | 50 |
| 51 private: | 51 private: |
| 52 void UpdateBubbleAndIconVisibility() override; | 52 void UpdateBubbleAndIconVisibility() override; |
| 53 void UpdateAndroidAccountChooserInfoBarVisibility() override; | 53 void UpdateAndroidAccountChooserInfoBarVisibility() override; |
| 54 void UpdateAutoSigninSnackbarVisibility() override; | |
| 54 void SavePasswordInternal() override {} | 55 void SavePasswordInternal() override {} |
| 55 void UpdatePasswordInternal( | 56 void UpdatePasswordInternal( |
| 56 const autofill::PasswordForm& password_form) override {} | 57 const autofill::PasswordForm& password_form) override {} |
| 57 void NeverSavePasswordInternal() override; | 58 void NeverSavePasswordInternal() override; |
| 58 | 59 |
| 59 base::TimeDelta elapsed_; | 60 base::TimeDelta elapsed_; |
| 60 bool opened_bubble_; | 61 bool opened_bubble_; |
| 61 }; | 62 }; |
| 62 | 63 |
| 63 TestManagePasswordsUIController::TestManagePasswordsUIController( | 64 TestManagePasswordsUIController::TestManagePasswordsUIController( |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 83 ManagePasswordsUIController::UpdateBubbleAndIconVisibility(); | 84 ManagePasswordsUIController::UpdateBubbleAndIconVisibility(); |
| 84 if (opened_bubble_) | 85 if (opened_bubble_) |
| 85 OnBubbleShown(); | 86 OnBubbleShown(); |
| 86 } | 87 } |
| 87 | 88 |
| 88 void TestManagePasswordsUIController:: | 89 void TestManagePasswordsUIController:: |
| 89 UpdateAndroidAccountChooserInfoBarVisibility() { | 90 UpdateAndroidAccountChooserInfoBarVisibility() { |
| 90 OnBubbleShown(); | 91 OnBubbleShown(); |
| 91 } | 92 } |
| 92 | 93 |
| 94 void TestManagePasswordsUIController::UpdateAutoSigninSnackbarVisibility() { | |
|
newt (away)
2015/08/21 05:40:39
Which test(s) are actually testing this feature?
melandory
2015/08/21 09:41:15
The method is called when similar UI for desktop a
| |
| 95 OnBubbleShown(); | |
| 96 } | |
| 97 | |
| 93 void TestManagePasswordsUIController::NeverSavePasswordInternal() { | 98 void TestManagePasswordsUIController::NeverSavePasswordInternal() { |
| 94 autofill::PasswordForm blacklisted; | 99 autofill::PasswordForm blacklisted; |
| 95 blacklisted.origin = this->origin(); | 100 blacklisted.origin = this->origin(); |
| 96 blacklisted.signon_realm = blacklisted.origin.spec(); | 101 blacklisted.signon_realm = blacklisted.origin.spec(); |
| 97 blacklisted.blacklisted_by_user = true; | 102 blacklisted.blacklisted_by_user = true; |
| 98 password_manager::PasswordStoreChange change( | 103 password_manager::PasswordStoreChange change( |
| 99 password_manager::PasswordStoreChange::ADD, blacklisted); | 104 password_manager::PasswordStoreChange::ADD, blacklisted); |
| 100 password_manager::PasswordStoreChangeList list(1, change); | 105 password_manager::PasswordStoreChangeList list(1, change); |
| 101 OnLoginsChanged(list); | 106 OnLoginsChanged(list); |
| 102 } | 107 } |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 577 password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES); | 582 password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES); |
| 578 controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass()); | 583 controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass()); |
| 579 | 584 |
| 580 ManagePasswordsIconMock mock; | 585 ManagePasswordsIconMock mock; |
| 581 controller()->UpdateIconAndBubbleState(&mock); | 586 controller()->UpdateIconAndBubbleState(&mock); |
| 582 EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, mock.state()); | 587 EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, mock.state()); |
| 583 controller()->UpdatePassword(autofill::PasswordForm()); | 588 controller()->UpdatePassword(autofill::PasswordForm()); |
| 584 controller()->UpdateIconAndBubbleState(&mock); | 589 controller()->UpdateIconAndBubbleState(&mock); |
| 585 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); | 590 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); |
| 586 } | 591 } |
| OLD | NEW |