Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(955)

Side by Side Diff: chrome/browser/ui/views/autofill/autofill_dialog_views.cc

Issue 101383006: Fix glitch that allows both "Loading..." and "[x] Save details in Chrome" to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/views/autofill/autofill_dialog_views.h" 5 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1391 sign_in_delegate_.reset( 1391 sign_in_delegate_.reset(
1392 new AutofillDialogSignInDelegate( 1392 new AutofillDialogSignInDelegate(
1393 this, 1393 this,
1394 sign_in_web_view_->GetWebContents(), 1394 sign_in_web_view_->GetWebContents(),
1395 delegate_->GetWebContents(), 1395 delegate_->GetWebContents(),
1396 gfx::Size(min_width, min_height), GetMaximumSignInViewSize())); 1396 gfx::Size(min_width, min_height), GetMaximumSignInViewSize()));
1397 sign_in_web_view_->LoadInitialURL(delegate_->SignInUrl()); 1397 sign_in_web_view_->LoadInitialURL(delegate_->SignInUrl());
1398 1398
1399 ShowDialogInMode(SIGN_IN); 1399 ShowDialogInMode(SIGN_IN);
1400 1400
1401 UpdateButtonStrip();
1402 ContentsPreferredSizeChanged(); 1401 ContentsPreferredSizeChanged();
1403 1402
1404 return &sign_in_web_view_->web_contents()->GetController(); 1403 return &sign_in_web_view_->web_contents()->GetController();
1405 } 1404 }
1406 1405
1407 void AutofillDialogViews::HideSignIn() { 1406 void AutofillDialogViews::HideSignIn() {
1408 sign_in_web_view_->SetWebContents(NULL); 1407 sign_in_web_view_->SetWebContents(NULL);
1409 1408
1410 if (delegate_->ShouldShowSpinner()) { 1409 if (delegate_->ShouldShowSpinner()) {
1411 UpdateAccountChooser(); 1410 UpdateAccountChooser();
1412 } else { 1411 } else {
1413 ShowDialogInMode(DETAIL_INPUT); 1412 ShowDialogInMode(DETAIL_INPUT);
1414 InvalidateLayout(); 1413 InvalidateLayout();
1415 } 1414 }
1416 DCHECK(!sign_in_web_view_->visible()); 1415 DCHECK(!sign_in_web_view_->visible());
1417 1416
1418 UpdateButtonStrip();
1419 ContentsPreferredSizeChanged(); 1417 ContentsPreferredSizeChanged();
1420 } 1418 }
1421 1419
1422 void AutofillDialogViews::ModelChanged() { 1420 void AutofillDialogViews::ModelChanged() {
1423 menu_runner_.reset(); 1421 menu_runner_.reset();
1424 1422
1425 for (DetailGroupMap::const_iterator iter = detail_groups_.begin(); 1423 for (DetailGroupMap::const_iterator iter = detail_groups_.begin();
1426 iter != detail_groups_.end(); ++iter) { 1424 iter != detail_groups_.end(); ++iter) {
1427 UpdateDetailsGroupState(iter->second); 1425 UpdateDetailsGroupState(iter->second);
1428 } 1426 }
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
2451 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section) 2449 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
2452 : section(section), 2450 : section(section),
2453 container(NULL), 2451 container(NULL),
2454 manual_input(NULL), 2452 manual_input(NULL),
2455 suggested_info(NULL), 2453 suggested_info(NULL),
2456 suggested_button(NULL) {} 2454 suggested_button(NULL) {}
2457 2455
2458 AutofillDialogViews::DetailsGroup::~DetailsGroup() {} 2456 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
2459 2457
2460 } // namespace autofill 2458 } // namespace autofill
OLDNEW
« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698