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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 1819 matching lines @@
         if (instruments[i]->object_id() ==
                 wallet_items_->default_instrument_id()) {
           suggested_cc_billing_.SetCheckedItem(key);
         }
       }
 
       // TODO(estade): this should have a URL sublabel.
       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_ ||

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

don't need to check wallet_items_ imo --- several places just above this assume
walleT_items_ to be non null

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

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

+          !wallet_items_->HasRequiredAction(wallet::SETUP_WALLET)) {
+        suggested_cc_billing_.AddKeyedItem(
+            kManageItemsKey,
+            l10n_util::GetStringUTF16(
+                IDS_AUTOFILL_DIALOG_MANAGE_BILLING_DETAILS));
+      }
     }
   } else {
     PersonalDataManager* manager = GetManager();
     const std::vector<CreditCard*>& cards = manager->GetCreditCards();
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     for (size_t i = 0; i < cards.size(); ++i) {
       suggested_cc_.AddKeyedItemWithIcon(
           cards[i]->guid(),
           cards[i]->Label(),
           rb.GetImageNamed(cards[i]->IconResourceId()));
@@ skipping 41 matching lines @@
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_EMAIL_ADDRESS));
   if (!IsPayingWithWallet()) {
     suggested_email_.AddKeyedItem(
         kManageItemsKey,
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_MANAGE_EMAIL_ADDRESS));
   }
 
   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
     // one exists. Otherwise it's the "Use shipping for billing" item.
     const std::string& first_real_suggestion_item_key =
         suggested_shipping_.GetItemKeyAt(1);
     if (IsASuggestionItemKey(first_real_suggestion_item_key))
       suggested_shipping_.SetCheckedItem(first_real_suggestion_item_key);
   }
 
@@ skipping 658 matching lines @@
         AutofillMetrics::DIALOG_USER_SIGNED_IN_NO_WALLET_NO_AUTOFILL;
   }
 
   // Has Wallet items.
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 }  // namespace autofill