Commit 339da92b authored by dbeam@chromium.org's avatar dbeam@chromium.org

Fix glitch that allows both "Loading..." and "[x] Save details in Chrome" to

show at the same time when clicking "Use Google Wallet".

BUG=331935
R=estade@chromium.org
TEST=manual

Review URL: https://codereview.chromium.org/101383006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243380 0039d316-1c4b-4281-b951-d872f2087c98
parent f1cd3365
...@@ -2022,14 +2022,12 @@ void AutofillDialogControllerImpl::SignInLinkClicked() { ...@@ -2022,14 +2022,12 @@ void AutofillDialogControllerImpl::SignInLinkClicked() {
handling_use_wallet_link_click_ = true; handling_use_wallet_link_click_ = true;
account_chooser_model_->SelectWalletAccount(0); account_chooser_model_->SelectWalletAccount(0);
FetchWalletCookie(); FetchWalletCookie();
view_->UpdateAccountChooser();
} else if (signin_registrar_.IsEmpty()) { } else if (signin_registrar_.IsEmpty()) {
// Start sign in. // Start sign in.
waiting_for_explicit_sign_in_response_ = true; waiting_for_explicit_sign_in_response_ = true;
content::Source<content::NavigationController> source(view_->ShowSignIn()); content::Source<content::NavigationController> source(view_->ShowSignIn());
signin_registrar_.Add( signin_registrar_.Add(
this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, source); this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, source);
view_->UpdateAccountChooser();
GetMetricLogger().LogDialogUiEvent( GetMetricLogger().LogDialogUiEvent(
AutofillMetrics::DIALOG_UI_SIGNIN_SHOWN); AutofillMetrics::DIALOG_UI_SIGNIN_SHOWN);
...@@ -2037,6 +2035,9 @@ void AutofillDialogControllerImpl::SignInLinkClicked() { ...@@ -2037,6 +2035,9 @@ void AutofillDialogControllerImpl::SignInLinkClicked() {
waiting_for_explicit_sign_in_response_ = false; waiting_for_explicit_sign_in_response_ = false;
HideSignIn(); HideSignIn();
} }
view_->UpdateAccountChooser();
view_->UpdateButtonStrip();
} }
void AutofillDialogControllerImpl::NotificationCheckboxStateChanged( void AutofillDialogControllerImpl::NotificationCheckboxStateChanged(
......
...@@ -1398,7 +1398,6 @@ const content::NavigationController* AutofillDialogViews::ShowSignIn() { ...@@ -1398,7 +1398,6 @@ const content::NavigationController* AutofillDialogViews::ShowSignIn() {
ShowDialogInMode(SIGN_IN); ShowDialogInMode(SIGN_IN);
UpdateButtonStrip();
ContentsPreferredSizeChanged(); ContentsPreferredSizeChanged();
return &sign_in_web_view_->web_contents()->GetController(); return &sign_in_web_view_->web_contents()->GetController();
...@@ -1415,7 +1414,6 @@ void AutofillDialogViews::HideSignIn() { ...@@ -1415,7 +1414,6 @@ void AutofillDialogViews::HideSignIn() {
} }
DCHECK(!sign_in_web_view_->visible()); DCHECK(!sign_in_web_view_->visible());
UpdateButtonStrip();
ContentsPreferredSizeChanged(); ContentsPreferredSizeChanged();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment