Removing unecessary button label

Remove the Cancel button from the app banner infobar on desktop.

This makes the infobar consistent with the mobile implementation, which
only has an Accept button and a dismissal X.

BUG=491001
R=benwells

Review URL: https://codereview.chromium.org/1163323004

Cr-Commit-Position: refs/heads/master@{#333720}

chrome/app/generated_resources.grd

@@ -7309,9 +7309,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_ADD_TO_SHELF_INFOBAR_ADD_BUTTON" desc="Text displayed on the button to allow users to add to the site to their shelf">
         Add
       </message>
-      <message name="IDS_ADD_TO_SHELF_INFOBAR_NEVER_BUTTON" desc="Text displayed on the button to prevent the add to shelf infobar from ever being displayed for this site">
-        Never for this site
-      </message>
 
       <!-- about:system strings -->
       <if expr="not is_android">

chrome/browser/banners/app_banner_infobar_delegate_desktop.cc

@@ -61,11 +61,13 @@ base::string16 AppBannerInfoBarDelegateDesktop::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_ADD_TO_SHELF_INFOBAR_TITLE);
 }
 
+int AppBannerInfoBarDelegateDesktop::GetButtons() const {
+  return BUTTON_OK;
+}
+
 base::string16 AppBannerInfoBarDelegateDesktop::GetButtonLabel(
     InfoBarButton button) const {
-  return l10n_util::GetStringUTF16((button == BUTTON_OK)
-                                       ? IDS_ADD_TO_SHELF_INFOBAR_ADD_BUTTON
-                                       : IDS_ADD_TO_SHELF_INFOBAR_NEVER_BUTTON);
+  return l10n_util::GetStringUTF16(IDS_ADD_TO_SHELF_INFOBAR_ADD_BUTTON);
 }
 
 bool AppBannerInfoBarDelegateDesktop::Accept() {
@@ -76,7 +78,7 @@ bool AppBannerInfoBarDelegateDesktop::Accept() {
   return true;
 }
 
-bool AppBannerInfoBarDelegateDesktop::Cancel() {
+void AppBannerInfoBarDelegateDesktop::InfoBarDismissed() {
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
   if (web_contents) {
@@ -91,11 +93,6 @@ bool AppBannerInfoBarDelegateDesktop::Cancel() {
         web_contents, web_manifest_.start_url.spec(),
         AppBannerSettingsHelper::WEB);
   }
-  return true;
-}
-
-void AppBannerInfoBarDelegateDesktop::InfoBarDismissed() {
-  Cancel();
 }
 
 }  // namespace banners

chrome/browser/banners/app_banner_infobar_delegate_desktop.h

@@ -41,10 +41,10 @@ class AppBannerInfoBarDelegateDesktop : public ConfirmInfoBarDelegate {
 
   // ConfirmInfoBarDelegate overrides.
   base::string16 GetMessageText() const override;
+  int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
 
   bool Accept() override;
-  bool Cancel() override;
 
   // InfoBarDelegate override.
   void InfoBarDismissed() override;