Omit "Manage your X..." menu model items when user is new.

Omit "Manage your X in Wallet..." menu model items when user is new to Wallet.

R=estade@chromium.org
BUG=239337
TEST=unit_tests, manual

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202007

[Evan Stade, 2013-05-23 16:32:12]

lgtm

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
File chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc (right):

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc:1840: if
(!wallet_items_ ||
don't need to check wallet_items_ imo --- several places just above this assume
walleT_items_ to be non null

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
File chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc (right):

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc:1316: // Make
sure the menu model item is created when desired.
s/when desired/for a returning Wallet user.

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc:1327: // Make
sure the menu model item is not created when unwanted.
s/when unwanted/for new wallet users.

[Dan Beam, 2013-05-23 19:31:16]

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
File chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc (right):

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc:1840: if
(!wallet_items_ ||
On 2013/05/23 16:32:12, Evan Stade wrote:
> don't need to check wallet_items_ imo --- several places just above this
assume
> walleT_items_ to be non null

Done. (didn't see the IsPayingWithWallet() above)

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
File chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc (right):

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc:1316: // Make
sure the menu model item is created when desired.
On 2013/05/23 16:32:12, Evan Stade wrote:
> s/when desired/for a returning Wallet user.

Done.

https://codereview.chromium.org/15742018/diff/2001/chrome/browser/ui/autofill...
chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc:1327: // Make
sure the menu model item is not created when unwanted.
On 2013/05/23 16:32:12, Evan Stade wrote:
> s/when unwanted/for new wallet users.

Done.

[commit-bot: I haz the power, 2013-05-23 19:33:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dbeam@chromium.org/15742018/8001

[commit-bot: I haz the power, 2013-05-23 19:33:55]

Failed to apply patch for
chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
  Hunk #1 FAILED at 1837.
  Hunk #2 succeeded at 1961 (offset 59 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc.rej

Patch:       chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
index
59bf9eaa35bd0d0af5ae678e6afe085c11bf0612..2e416d263f3293a333aa33d6f41984d80643513e
100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
@@ -1837,10 +1837,12 @@ void AutofillDialogControllerImpl::SuggestionsUpdated()
{
       suggested_cc_billing_.AddKeyedItem(
           kAddNewItemKey,
           l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_BILLING_DETAILS));
-      suggested_cc_billing_.AddKeyedItem(
-          kManageItemsKey,
-          l10n_util::GetStringUTF16(
-              IDS_AUTOFILL_DIALOG_MANAGE_BILLING_DETAILS));
+      if (!wallet_items_->HasRequiredAction(wallet::SETUP_WALLET)) {
+        suggested_cc_billing_.AddKeyedItem(
+            kManageItemsKey,
+            l10n_util::GetStringUTF16(
+                IDS_AUTOFILL_DIALOG_MANAGE_BILLING_DETAILS));
+      }
     }
   } else {
     PersonalDataManager* manager = GetManager();
@@ -1902,9 +1904,12 @@ void AutofillDialogControllerImpl::SuggestionsUpdated() {
   suggested_shipping_.AddKeyedItem(
       kAddNewItemKey,
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_SHIPPING_ADDRESS));
-  suggested_shipping_.AddKeyedItem(
-      kManageItemsKey,
-      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_MANAGE_SHIPPING_ADDRESS));
+  if (!IsPayingWithWallet() ||
+      !wallet_items_->HasRequiredAction(wallet::SETUP_WALLET)) {
+    suggested_shipping_.AddKeyedItem(
+        kManageItemsKey,
+       
l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_MANAGE_SHIPPING_ADDRESS));
+  }
 
   if (!IsPayingWithWallet()) {
     // When using Autofill, the default option is the first suggestion, if

[commit-bot: I haz the power, 2013-05-23 20:08:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dbeam@chromium.org/15742018/15001

[commit-bot: I haz the power, 2013-05-24 07:25:36]

Change committed as 202007