[Web Payments] Let subsheets define the initial focus

chrome/browser/ui/views/payments/payment_request_sheet_controller.h

 // Copyright 2016 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_PAYMENTS_PAYMENT_REQUEST_SHEET_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_SHEET_CONTROLLER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 15 matching lines @@
  public:
   // Objects of this class are owned by |dialog|, so it's a non-owned pointer
   // that should be valid throughout this object's lifetime.
   // |state| and |spec| are also not owned by this and are guaranteed to outlive
   // dialog. Neither |state|, |spec| or |dialog| should be null.
   PaymentRequestSheetController(PaymentRequestSpec* spec,
                                 PaymentRequestState* state,
                                 PaymentRequestDialogView* dialog);
   ~PaymentRequestSheetController() override;
 
+  // Creates a view to be displayed in the PaymentRequestDialog. The header view
+  //  is the view displayed on top of the dialog, containing title, (optional)

[Mathieu, 2017/05/04 19:32:34]

nit: extra leading space

[anthonyvd, 2017/05/04 20:56:59]

Done.

+  // back button, and close buttons.
+  // The content view is displayed between the header view and the pay/cancel
+  // buttons. Also adds the footer, returned by CreateFooterView(), which is
+  // clamped to the bottom of the containing view.  The returned view takes
+  // ownership of the header, the content, and the footer.
+  // +---------------------------+
+  // |        HEADER VIEW        |
+  // +---------------------------+
+  // |          CONTENT          |
+  // |           VIEW            |
+  // +---------------------------+
+  // | EXTRA VIEW | PAY | CANCEL | <-- footer
+  // +---------------------------+
   std::unique_ptr<views::View> CreateView();
 
   PaymentRequestSpec* spec() { return spec_; }
   PaymentRequestState* state() { return state_; }
 
   // The dialog that contains and owns this object.
   // Caller should not take ownership of the result.
   PaymentRequestDialogView* dialog() { return dialog_; }
 
  protected:
@@ skipping 48 matching lines @@
 
   // Returns the view that should be initially focused on this sheet. Typically,
   // this returns the primary button if it's enabled or the secondary button
   // otherwise. Subclasses may return a different view if they need focus to
   // start off on a different view (a textfield for example). This will only be
   // called after the view has been completely created through calls to
   // CreatePaymentView and related functions.
   virtual views::View* GetFirstFocusedView();
 
  private:
-  // Creates a view to be displayed in the PaymentRequestDialog.
-  // |header_view| is the view displayed on top of the dialog, containing title,
-  // (optional) back button, and close buttons.
-  // |content_view| is displayed between |header_view| and the pay/cancel
-  // buttons. Also adds the footer, returned by CreateFooterView(), which is
-  // clamped to the bottom of the containing view.  The returned view takes
-  // ownership of |header_view|, |content_view|, and the footer.
-  // +---------------------------+
-  // |        HEADER VIEW        |
-  // +---------------------------+
-  // |          CONTENT          |
-  // |           VIEW            |
-  // +---------------------------+
-  // | EXTRA VIEW | PAY | CANCEL | <-- footer
-  // +---------------------------+
-  std::unique_ptr<views::View> CreatePaymentView();
-
   // All these are not owned. Will outlive this.
   PaymentRequestSpec* spec_;
   PaymentRequestState* state_;
   PaymentRequestDialogView* dialog_;
 
   // This view is owned by its encompassing ScrollView.
   views::View* pane_;
   views::View* content_view_;
 
   // Hold on to the ScrollView because it must be explicitly laid out in some
   // cases.
   std::unique_ptr<views::ScrollView> scroll_;
 
   // Hold on to the primary and secondary buttons to use them as initial focus
   // targets when subclasses don't want to focus anything else.
   std::unique_ptr<views::Button> primary_button_;
   std::unique_ptr<views::Button> secondary_button_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestSheetController);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_SHEET_CONTROLLER_H_