autofill - Keep showing form preview while card unmasking prompt is up.

components/autofill/content/browser/content_autofill_driver.cc

 // Copyright 2014 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 "components/autofill/content/browser/content_autofill_driver.h"
 
 #include "base/command_line.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/autofill_client.h"
@@ skipping 128 matching lines @@
 
 void ContentAutofillDriver::RendererShouldPreviewFieldWithValue(
     const base::string16& value) {
   if (!RendererIsAvailable())
     return;
   render_frame_host_->Send(new AutofillMsg_PreviewFieldWithValue(
       render_frame_host_->GetRoutingID(), value));
 }
 
 void ContentAutofillDriver::PopupHidden() {
-  if (!RendererIsAvailable())
-    return;
-  render_frame_host_->Send(
-      new AutofillMsg_PopupHidden(render_frame_host_->GetRoutingID()));
+  // If the unmask prompt is showing, keep showing the preview. The preview
+  // will be cleared when the prompt closes.
+  if (!autofill_manager_->IsShowingUnmaskPrompt())
+    RendererShouldClearPreviewedForm();
 }
 
 bool ContentAutofillDriver::HandleMessage(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ContentAutofillDriver, message)
   IPC_MESSAGE_FORWARD(AutofillHostMsg_FirstUserGestureObserved, client_,
                       AutofillClient::OnFirstUserGestureObserved)
   IPC_MESSAGE_FORWARD(AutofillHostMsg_FormsSeen,
                       autofill_manager_.get(),
                       AutofillManager::OnFormsSeen)
@@ skipping 39 matching lines @@
     autofill_manager_->Reset();
 }
 
 void ContentAutofillDriver::SetAutofillManager(
     scoped_ptr<AutofillManager> manager) {
   autofill_manager_ = manager.Pass();
   autofill_manager_->SetExternalDelegate(&autofill_external_delegate_);
 }
 
 }  // namespace autofill