Update Chrome Upstream flow to reflect new UI mocks

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"
@@ skipping 27 matching lines @@
   // Bubble will be anchored to |anchor_view|.
   SaveCardBubbleViews(views::View* anchor_view,
                       content::WebContents* web_contents,
                       SaveCardBubbleController* controller);
 
   void Show(DisplayReason reason);
 
   // SaveCardBubbleView
   void Hide() override;
 
+  // views::DialogDelegate
+  int GetDialogButtons() const override;
+
   // views::BubbleDialogDelegateView
   views::View* CreateExtraView() override;
   views::View* CreateFootnoteView() override;
   bool Accept() override;
   bool Cancel() override;
   bool Close() override;
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
   bool IsDialogButtonEnabled(ui::DialogButton button) const override;
 
   // views::View
   gfx::Size CalculatePreferredSize() const override;
 
   // views::WidgetDelegate
+  bool ShouldShowCloseButton() const override;

[jiahuiguo, 2017/06/27 01:21:10]

Should we add a "Should" here? Looks ShowCloseButton() is enough?

[Jared Saul, 2017/06/27 01:31:47]

It's overriding a method in views::WidgetDelegate:
https://cs.chromium.org/chromium/src/ui/views/widget/widget_delegate.h?l=87&r...

   base::string16 GetWindowTitle() const override;
   void WindowClosing() override;
 
   // views::LinkListener
   void LinkClicked(views::Link* source, int event_flags) override;
 
   // views::StyledLabelListener
   void StyledLabelLinkClicked(views::StyledLabel* label,
                               const gfx::Range& range,
                               int event_flags) override;
 
   // views::TextfieldController
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) override;
 
  private:
+  // The current step of the save card flow.  Accounts for:
+  //  1) Local save vs. Upload save
+  //  2) Upload save can have all information or be missing CVC
+  enum CurrentFlowStep {
+    UNKNOWN_STEP,
+    LOCAL_SAVE_ONLY_STEP,
+    UPLOAD_SAVE_ONLY_STEP,
+    UPLOAD_SAVE_CVC_FIX_FLOW_STEP_1,

[Shanfeng, 2017/06/27 04:00:31]

It would be better if replace step_1 with a more specific name.  ditto for step
2.

[Jared Saul, 2017/06/27 16:38:02]

I kept the STEP_1 and STEP_2 parts so it's clear what order these things happen
in, but I added _OFFER_UPLOAD and _REQUEST_CVC to make it more descriptive about
what each step entails.

+    UPLOAD_SAVE_CVC_FIX_FLOW_STEP_2,
+  };
+
   ~SaveCardBubbleViews() override;
 
+  CurrentFlowStep GetCurrentFlowStep() const;
   std::unique_ptr<views::View> CreateMainContentView();
   std::unique_ptr<views::View> CreateRequestCvcView();
 
   // views::BubbleDialogDelegateView
   void Init() override;
 
   SaveCardBubbleController* controller_;  // Weak reference.
 
+  views::View* footnote_view_ = nullptr;
+
   ViewStack* view_stack_ = nullptr;
 
   views::Textfield* cvc_textfield_ = nullptr;
 
   views::Link* learn_more_link_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(SaveCardBubbleViews);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOFILL_SAVE_CARD_BUBBLE_VIEWS_H_