Merge from Chromium at DEPS revision r213780
This commit was generated by merge_to_master.py.
Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index 88e7429..7769189 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -92,6 +92,10 @@
void Show();
void Hide();
+ // Called when the tab hosting this dialog is activated by a user gesture.
+ // Used to trigger a refresh of the user's Wallet data.
+ void TabActivated();
+
// Adds a step in the flow to the Autocheckout UI.
void AddAutocheckoutStep(AutocheckoutStepType step_type);
@@ -597,6 +601,15 @@
scoped_ptr<wallet::WalletItems> wallet_items_;
scoped_ptr<wallet::FullWallet> full_wallet_;
+ // The last active instrument and shipping address object ids. These
+ // variables are only set (i.e. non-empty) when the Wallet items are being
+ // re-fetched.
+ std::string previously_selected_instrument_id_;
+ std::string previously_selected_shipping_address_id_;
+
+ // When the Wallet items were last fetched.
+ base::TimeTicks last_wallet_items_fetch_timestamp_;
+
// Local machine signals to pass along on each request to trigger (or
// discourage) risk challenges; sent if the user is up to date on legal docs.
std::string risk_data_;