Use ViewStack to convert card upload request CVC experiment to 2-step flow

chrome/browser/ui/views/autofill/save_card_bubble_views.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_SAVE_CARD_BUBBLE_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_SAVE_CARD_BUBBLE_VIEWS_H_
 
 #include "base/macros.h"
 #include "chrome/browser/ui/autofill/save_card_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
+#include "chrome/browser/ui/views/payments/view_stack.h"
 #include "components/autofill/core/browser/ui/save_card_bubble_controller.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace views {
@@ skipping 50 matching lines @@
                               int event_flags) override;
 
   // views::TextfieldController
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) override;
 
  private:
   ~SaveCardBubbleViews() override;
 
   std::unique_ptr<views::View> CreateMainContentView();
-  std::unique_ptr<views::View> CreateRequestCvcView();
+  void CreateAndAddRequestCvcViewToViewStack();
+
+  // Returns whether the upload or local save version of the UI is being shown.
+  bool IsUploading();
 
   // views::BubbleDialogDelegateView
   void Init() override;
 
   SaveCardBubbleController* controller_;  // Weak reference.
 
+  views::Link* learn_more_link_;

[Mathieu, 2017/05/17 23:53:01]

curious: any reason for bringing this up ? 

[Jared Saul, 2017/05/18 17:01:23]

It was purely so that it wasn't mistaken as part of the "// Upload save state"
block.  Since view_stack_ is going to be used in both local and upload cases,
though, I reverted this.

+
+  // Upload save state
+  std::unique_ptr<ViewStack> view_stack_;
   views::Textfield* cvc_textfield_;
 
-  views::Link* learn_more_link_;
-
   DISALLOW_COPY_AND_ASSIGN(SaveCardBubbleViews);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOFILL_SAVE_CARD_BUBBLE_VIEWS_H_