Revert 180111, it was not the cause, says isherman@.

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/wallet/wallet_service_url.h"
@@ skipping 287 matching lines @@
   detail_groups_.insert(std::make_pair(SECTION_SHIPPING,
                                        DetailsGroup(SECTION_SHIPPING)));
 }
 
 AutofillDialogViews::~AutofillDialogViews() {
   DCHECK(!window_);
 }
 
 void AutofillDialogViews::Show() {
   InitChildViews();
+  UpdateAccountChooser();
   UpdateNotificationArea();
 
   // Ownership of |contents_| is handed off by this call. The
   // WebContentsModalDialog will take care of deleting itself after calling
   // DeleteDelegate().
   window_ = new ConstrainedWindowViews(controller_->web_contents(), this);
   focus_manager_ = window_->GetFocusManager();
   focus_manager_->AddFocusChangeListener(this);
 }
 
@@ skipping 276 matching lines @@
   notification_area->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
   notification_area->set_background(
       views::Background::CreateSolidBackground(SK_ColorTRANSPARENT));
 
   DCHECK(!notification_label_);
   notification_label_ = new views::Label();
   notification_label_->SetAutoColorReadabilityEnabled(false);
   notification_label_->SetMultiLine(true);
   notification_label_->set_collapse_when_hidden(true);
+  notification_label_->set_border(
+      views::Border::CreateEmptyBorder(10, 0, 10, 0));
+  // TODO(dbeam): talk to msw@ or ainslie@ to make this border match the mocks.
 
   notification_area->AddChildView(notification_label_);
 
   return notification_area;
 }
 
+void AutofillDialogViews::UpdateAccountChooser() {
+  DialogSignedInState state = controller_->SignedInState();
+  sign_in_link_->SetEnabled(state != REQUIRES_RESPONSE);
+  sign_in_link_->SetVisible(state != SIGNED_IN);
+}
+
 void AutofillDialogViews::UpdateNotificationArea() {
   DCHECK(notification_label_);
 
   const DialogNotification& notification = controller_->CurrentNotification();
   const string16& display_text = notification.display_text();
 
   notification_label_->parent()->SetVisible(!display_text.empty());
   notification_label_->SetVisible(!display_text.empty());
 
   notification_label_->SetText(display_text);
@@ skipping 267 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill