Move card unmask interfaces and controller into the autofill component.

chrome/browser/ui/views/autofill/card_unmask_prompt_views.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 "chrome/browser/ui/views/autofill/card_unmask_prompt_views.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
-#include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
+#include "chrome/browser/ui/autofill/create_card_unmask_prompt_view.h"
 #include "chrome/browser/ui/views/autofill/decorated_textfield.h"
 #include "chrome/browser/ui/views/autofill/tooltip_icon.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/autofill/core/browser/ui/card_unmask_prompt_controller.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositing_recorder.h"
 #include "ui/gfx/canvas.h"
@@ skipping 10 matching lines @@
 #include "ui/views/window/dialog_client_view.h"
 
 namespace autofill {
 
 // The number of pixels of blank space on the outer horizontal edges of the
 // dialog.
 const int kEdgePadding = 19;
 
 SkColor kGreyTextColor = SkColorSetRGB(0x64, 0x64, 0x64);
 
-// static
-CardUnmaskPromptView* CardUnmaskPromptView::CreateAndShow(
-    CardUnmaskPromptController* controller) {
-  CardUnmaskPromptViews* view = new CardUnmaskPromptViews(controller);
-  view->Show();
-  return view;
+CardUnmaskPromptView* CreateCardUnmaskPromptView(
+    CardUnmaskPromptController* controller,
+    content::WebContents* web_contents) {
+  return new CardUnmaskPromptViews(controller, web_contents);
 }
 
 CardUnmaskPromptViews::CardUnmaskPromptViews(
-    CardUnmaskPromptController* controller)
+    CardUnmaskPromptController* controller,
+    content::WebContents* web_contents)
     : controller_(controller),
+      web_contents_(web_contents),
       main_contents_(nullptr),
       permanent_error_label_(nullptr),
       input_row_(nullptr),
       cvc_input_(nullptr),
       month_input_(nullptr),
       year_input_(nullptr),
       new_card_link_(nullptr),
       error_icon_(nullptr),
       error_label_(nullptr),
       storage_row_(nullptr),
       storage_checkbox_(nullptr),
       progress_overlay_(nullptr),
       progress_throbber_(nullptr),
       progress_label_(nullptr),
       overlay_animation_(this),
       weak_ptr_factory_(this) {
 }
 
 CardUnmaskPromptViews::~CardUnmaskPromptViews() {
   if (controller_)
     controller_->OnUnmaskDialogClosed();
 }
 
 void CardUnmaskPromptViews::Show() {
-  constrained_window::ShowWebModalDialogViews(this,
-                                              controller_->GetWebContents());
+  constrained_window::ShowWebModalDialogViews(this, web_contents_);
 }
 
 void CardUnmaskPromptViews::ControllerGone() {
   controller_ = nullptr;
   ClosePrompt();
 }
 
 void CardUnmaskPromptViews::DisableAndWaitForVerification() {
   SetInputsEnabled(false);
   progress_overlay_->SetAlpha(0);
@@ skipping 71 matching lines @@
     error_label_->SetMultiLine(false);
     error_label_->SetText(base::ASCIIToUTF16(" "));
     error_icon_->SetVisible(false);
   } else {
     error_label_->SetMultiLine(true);
     error_label_->SetText(message);
     error_icon_->SetVisible(true);
   }
 
   // Update the dialog's size.
-  if (GetWidget() && controller_->GetWebContents()) {
+  if (GetWidget() && web_contents_) {
     constrained_window::UpdateWebContentsModalDialogPosition(
-        GetWidget(), web_modal::WebContentsModalDialogManager::FromWebContents(
-                         controller_->GetWebContents())
-                         ->delegate()
-                         ->GetWebContentsModalDialogHost());
+        GetWidget(),
+        web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_)
+            ->delegate()
+            ->GetWebContentsModalDialogHost());
   }
 
   Layout();
 }
 
 void CardUnmaskPromptViews::SetInputsEnabled(bool enabled) {
   cvc_input_->SetEnabled(enabled);
   if (storage_checkbox_)
     storage_checkbox_->SetEnabled(enabled);
   month_input_->SetEnabled(enabled);
@@ skipping 327 matching lines @@
   views::View::OnPaint(canvas);
   canvas->Restore();
 }
 
 void CardUnmaskPromptViews::FadeOutView::SetAlpha(uint8_t alpha) {
   alpha_ = alpha;
   SchedulePaint();
 }
 
 }  // namespace autofill