rAc: better Wallet error messages.

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 <map>
 #include <string>
 
@@ skipping 73 matching lines @@
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace autofill {
 
 namespace {
 
 const char kAddNewItemKey[] = "add-new-item";
 const char kManageItemsKey[] = "manage-items";
 const char kSameAsBillingKey[] = "same-as-billing";
 
+// URLs for Wallet error messages.
+const char kBlaStatusUrl[] = "https://wallet.google.com/manage/settings";
+const char kKycStatusUrl[] = "https://wallet.google.com/kyc";

[Ilya Sherman, 2013/08/29 00:26:11]

nit: Please eschew acronyms like "bla" and "kyc" in favor of something more
transparent / less jargony.

[Evan Stade, 2013/08/30 02:52:21]

Done.

+
 // Keys for the kAutofillDialogAutofillDefault pref dictionary (do not change
 // these values).
 const char kGuidPrefKey[] = "guid";
 const char kVariantPrefKey[] = "variant";
 
 // This string is stored along with saved addresses and credit cards in the
 // WebDB, and hence should not be modified, so that it remains consistent over
 // time.
 const char kAutofillDialogOrigin[] = "Chrome Autofill dialog";
 
@@ skipping 239 matching lines @@
 
     case wallet::FormFieldError::UNKNOWN_LOCATION:
       NOTREACHED();
       return SECTION_MAX;
   }
 
   NOTREACHED();
   return SECTION_MAX;
 }
 
-base::string16 WalletErrorMessage(wallet::WalletClient::ErrorType error_type) {
+scoped_ptr<DialogNotification> GetWalletError(
+    wallet::WalletClient::ErrorType error_type) {
+  base::string16 text;
+  GURL url;
+
   switch (error_type) {
-    case wallet::WalletClient::BUYER_ACCOUNT_ERROR:
-      return l10n_util::GetStringUTF16(IDS_AUTOFILL_WALLET_BUYER_ACCOUNT_ERROR);
+    case wallet::WalletClient::UNVERIFIED_KNOW_YOUR_CUSTOMER_STATUS:
+      text = l10n_util::GetStringUTF16(
+          IDS_AUTOFILL_WALLET_UNVERIFIED_KNOW_YOUR_CUSTOMER_STATUS);
+      url = GURL(kKycStatusUrl);
+      break;
 
     case wallet::WalletClient::BUYER_LEGAL_ADDRESS_NOT_SUPPORTED:
-      return l10n_util::GetStringUTF16(
+      text = l10n_util::GetStringUTF16(
           IDS_AUTOFILL_WALLET_BUYER_COUNTRY_NOT_SUPPORTED);
+      url = GURL(kBlaStatusUrl);
+      break;
 
+    default:
+      break;

[Ilya Sherman, 2013/08/29 00:26:11]

nit: This looks a little weird without a comment.  Ditto below.

[Evan Stade, 2013/08/30 02:52:21]

Done.

+  }
+
+  if (!text.empty()) {
+    scoped_ptr<DialogNotification> notification(new DialogNotification(
+        DialogNotification::WALLET_ERROR,
+        text));
+    notification->set_link_url(url);
+    return notification.Pass();
+  }
+
+  switch (error_type) {
     case wallet::WalletClient::UNSUPPORTED_MERCHANT:
-      return l10n_util::GetStringUTF16(
+      text = l10n_util::GetStringUTF16(
           IDS_AUTOFILL_WALLET_UNSUPPORTED_MERCHANT);
+      break;
 
     case wallet::WalletClient::BAD_REQUEST:
-      return l10n_util::GetStringFUTF16(
+      text = l10n_util::GetStringFUTF16(
           IDS_AUTOFILL_WALLET_UPGRADE_CHROME_ERROR,
           ASCIIToUTF16("71"));
+      break;
 
     case wallet::WalletClient::INVALID_PARAMS:
-      return l10n_util::GetStringFUTF16(
+      text = l10n_util::GetStringFUTF16(
           IDS_AUTOFILL_WALLET_UPGRADE_CHROME_ERROR,
           ASCIIToUTF16("42"));
+      break;
 
-    case wallet::WalletClient::UNVERIFIED_KNOW_YOUR_CUSTOMER_STATUS:
-      return l10n_util::GetStringUTF16(
-          IDS_AUTOFILL_WALLET_UNVERIFIED_KNOW_YOUR_CUSTOMER_STATUS);
+    case wallet::WalletClient::BUYER_ACCOUNT_ERROR:
+      text = l10n_util::GetStringUTF16(IDS_AUTOFILL_WALLET_BUYER_ACCOUNT_ERROR);
+      break;
 
     case wallet::WalletClient::UNSUPPORTED_API_VERSION:
-      return l10n_util::GetStringFUTF16(
+      text = l10n_util::GetStringFUTF16(
           IDS_AUTOFILL_WALLET_UPGRADE_CHROME_ERROR,
           ASCIIToUTF16("43"));
+      break;
 
     case wallet::WalletClient::SERVICE_UNAVAILABLE:
-      return l10n_util::GetStringUTF16(
+      text = l10n_util::GetStringUTF16(
           IDS_AUTOFILL_WALLET_SERVICE_UNAVAILABLE_ERROR);
+      break;
 
     case wallet::WalletClient::INTERNAL_ERROR:
-      return l10n_util::GetStringFUTF16(IDS_AUTOFILL_WALLET_UNKNOWN_ERROR,
+      text = l10n_util::GetStringFUTF16(IDS_AUTOFILL_WALLET_UNKNOWN_ERROR,
                                         ASCIIToUTF16("62"));
+      break;
 
     case wallet::WalletClient::MALFORMED_RESPONSE:
-      return l10n_util::GetStringFUTF16(IDS_AUTOFILL_WALLET_UNKNOWN_ERROR,
+      text = l10n_util::GetStringFUTF16(IDS_AUTOFILL_WALLET_UNKNOWN_ERROR,
                                         ASCIIToUTF16("72"));
+      break;
 
     case wallet::WalletClient::NETWORK_ERROR:
-      return l10n_util::GetStringFUTF16(IDS_AUTOFILL_WALLET_UNKNOWN_ERROR,
+      text = l10n_util::GetStringFUTF16(IDS_AUTOFILL_WALLET_UNKNOWN_ERROR,
                                         ASCIIToUTF16("73"));
+      break;
 
     case wallet::WalletClient::UNKNOWN_ERROR:
-      return l10n_util::GetStringFUTF16(IDS_AUTOFILL_WALLET_UNKNOWN_ERROR,
+      text = l10n_util::GetStringFUTF16(IDS_AUTOFILL_WALLET_UNKNOWN_ERROR,
                                         ASCIIToUTF16("74"));
+      break;
+
+    default:
+      break;
   }
 
-  NOTREACHED();
-  return base::string16();
+  if (text.empty())
+    NOTREACHED();

[Ilya Sherman, 2013/08/29 00:26:11]

nit: DCHECK(!text.empty());

[Evan Stade, 2013/08/30 02:52:21]

Done.

+
+  // The other error types are strings of the form "XXX. You can pay without
+  // wallet."
+  return scoped_ptr<DialogNotification>(new DialogNotification(

[Ilya Sherman, 2013/08/29 00:26:11]

nit: make_scoped_ptr

[Evan Stade, 2013/08/30 02:52:21]

Done.

+      DialogNotification::WALLET_ERROR,
+      l10n_util::GetStringFUTF16(IDS_AUTOFILL_DIALOG_COMPLETE_WITHOUT_WALLET,
+                                 text)));
 }
 
 gfx::Image GetGeneratedCardImage(const string16& card_number) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::ImageSkia* card =
       rb.GetImageSkiaNamed(IDR_AUTOFILL_GENERATED_CARD);
   gfx::Canvas canvas(card->size(), ui::SCALE_FACTOR_100P, false);
   canvas.DrawImageInt(*card, 0, 0);
 
   gfx::Rect display_rect(gfx::Point(), card->size());
@@ skipping 1403 matching lines @@
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SECURITY_WARNING)));
   }
 
   if (!invoked_from_same_origin_) {
     notifications.push_back(DialogNotification(
         DialogNotification::SECURITY_WARNING,
         l10n_util::GetStringFUTF16(IDS_AUTOFILL_DIALOG_SITE_WARNING,
                                    UTF8ToUTF16(source_url_.host()))));
   }
 
-  if (account_chooser_model_.HadWalletError()) {
-    // TODO(dbeam): figure out a way to dismiss this error after a while.
-    notifications.push_back(DialogNotification(
-        DialogNotification::WALLET_ERROR,
-        l10n_util::GetStringFUTF16(
-            IDS_AUTOFILL_DIALOG_COMPLETE_WITHOUT_WALLET,
-            account_chooser_model_.wallet_error_message())));
-  }
+  // TODO(dbeam): figure out a way to dismiss this error after a while.
+  if (wallet_error_notification_)
+    notifications.push_back(*wallet_error_notification_);
 
   if (IsSubmitPausedOn(wallet::VERIFY_CVV)) {
     notifications.push_back(DialogNotification(
         DialogNotification::REQUIRED_ACTION,
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_VERIFY_CVV)));
   }
 
   if (autocheckout_state_ == AUTOCHECKOUT_ERROR) {
     notifications.push_back(DialogNotification(
         DialogNotification::AUTOCHECKOUT_ERROR,
@@ skipping 617 matching lines @@
   GetWalletClient()->CancelRequests();
   SetAutocheckoutState(AUTOCHECKOUT_NOT_STARTED);
   for (std::vector<DialogAutocheckoutStep>::iterator it = steps_.begin();
       it != steps_.end(); ++it) {
     if (it->type() == AUTOCHECKOUT_STEP_PROXY_CARD) {
       steps_.erase(it);
       break;
     }
   }
   SetIsSubmitting(false);
-  account_chooser_model_.SetHadWalletError(WalletErrorMessage(error_type));
+  wallet_error_notification_ = GetWalletError(error_type);
+  account_chooser_model_.SetHadWalletError();
 }
 
 void AutofillDialogControllerImpl::SuggestionsUpdated() {
   ScopedViewUpdates updates(view_.get());
 
   const DetailOutputMap snapshot = TakeUserInputSnapshot();
 
   suggested_email_.Reset();
   suggested_cc_.Reset();
   suggested_billing_.Reset();
@@ skipping 1009 matching lines @@
   }
 #if !defined(OS_ANDROID)
   GeneratedCreditCardBubbleController::Show(
       web_contents(),
       backing_last_four,
       full_wallet_->TypeAndLastFourDigits());
 #endif
 }
 
 }  // namespace autofill