[Merge M60][Payments] Do not select an address if the merchant doesn't support it

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

 // Copyright 2017 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_ITEM_LIST_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_ITEM_LIST_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 22 matching lines @@
    public:
     // Creates an item that will be owned by |list| with the initial state set
     // to |selected|.
     Item(PaymentRequestSpec* spec,
          PaymentRequestState* state,
          PaymentRequestItemList* list,
          bool selected,
          bool show_edit_button);
     ~Item() override;
 
-    // Gets the view associated with this item. It's owned by this object so
-    // that it can listen to any changes to the underlying model and update the
-    // view.
-    views::View* GetItemView();
-
     bool selected() const { return selected_; }
     // Changes the selected state of this item to |selected|.
     // SelectedStateChanged is called if |notify| is true.
     void SetSelected(bool selected, bool notify);
 
+    // Creates and returns the view associated with this list item.
+    std::unique_ptr<views::View> CreateItemView();
+
     // Returns a pointer to the PaymentRequestItemList that owns this object.
     PaymentRequestItemList* list() { return list_; }
 
     // Returns a pointer to the PaymentRequestSpec/State objects associated with
     // this instance of the UI.
     PaymentRequestSpec* spec() { return spec_; }
     PaymentRequestState* state() { return state_; }
 
    protected:
     // Called when the selected state of this item changes. Subclasses may
@@ skipping 25 matching lines @@
 
     // Performs the action that replaces selection when CanBeSelected returns
     // false. This will usually be to display an editor.
     virtual void PerformSelectionFallback() = 0;
 
     // Called when the edit button is pressed. Subclasses should open the editor
     // appropriate for the item they represent.
     virtual void EditButtonPressed() = 0;
 
    private:
-    // Creates and returns the view associated with this list item.
-    std::unique_ptr<views::View> CreateItemView();
-
     // views::ButtonListener:
     void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-    std::unique_ptr<views::View> item_view_;
     PaymentRequestSpec* spec_;
     PaymentRequestState* state_;
     PaymentRequestItemList* list_;
     std::unique_ptr<views::ImageView> checkmark_;
     bool selected_;
     bool show_edit_button_;
 
     DISALLOW_COPY_AND_ASSIGN(Item);
   };
 
@@ skipping 19 matching lines @@
 
   std::vector<std::unique_ptr<Item>> items_;
   Item* selected_item_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestItemList);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_ITEM_LIST_H_