Removed the "Don't ask again" button on the default browser prompt

chrome/browser/ui/startup/default_browser_infobar_delegate.cc

 // Copyright 2016 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/startup/default_browser_infobar_delegate.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/grit/chromium_strings.h"
@@ skipping 109 matching lines @@
   return ConfirmInfoBarDelegate::GetIcon();
 }
 #endif  // defined(OS_WIN)
 
 bool DefaultBrowserInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   return should_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details);
 }
 
 void DefaultBrowserInfoBarDelegate::InfoBarDismissed() {
+  // This can get reached in tests where profile_ is null.

[grt (UTC plus 2), 2016/07/14 06:31:16]

does this treat 'x' and ignore equally? IIUC, 'x' should do what Cancel once
did, and ignore should still be ignore.

[Patrick Monette, 2016/07/14 17:42:57]

InfoBarDismissed() is only called when the (X) button is used, not when the
infobar is ignored.

+  if (profile_)
+    chrome::DefaultBrowserPromptDeclined(profile_);
   content::RecordAction(
       base::UserMetricsAction("DefaultBrowserInfoBar_Dismiss"));
   UMA_HISTOGRAM_ENUMERATION("DefaultBrowser.InfoBar.UserInteraction",
                             IGNORE_INFO_BAR,
                             NUM_INFO_BAR_USER_INTERACTION_TYPES);
 }
 
 base::string16 DefaultBrowserInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT);
 }
 
+int DefaultBrowserInfoBarDelegate::GetButtons() const {
+  return BUTTON_OK;
+}
+
 base::string16 DefaultBrowserInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
+  DCHECK_EQ(BUTTON_OK, button);
 #if defined(OS_WIN)
   // On Windows 10, the "OK" button opens the Windows Settings application,
   // through which the user must make their default browser choice.
   const int kSetAsDefaultButtonMessageId =
       base::win::GetVersion() >= base::win::VERSION_WIN10
           ? IDS_DEFAULT_BROWSER_INFOBAR_OK_BUTTON_LABEL_WIN_10
           : IDS_DEFAULT_BROWSER_INFOBAR_OK_BUTTON_LABEL;
 #else
   const int kSetAsDefaultButtonMessageId =
       IDS_DEFAULT_BROWSER_INFOBAR_OK_BUTTON_LABEL;
 #endif
-  return l10n_util::GetStringUTF16(
-      button == BUTTON_OK ? kSetAsDefaultButtonMessageId
-                          : IDS_DEFAULT_BROWSER_INFOBAR_CANCEL_BUTTON_LABEL);
+  return l10n_util::GetStringUTF16(kSetAsDefaultButtonMessageId);
 }
 
 // Setting an app as the default browser doesn't require elevation directly, but
 // it does require registering it as the protocol handler for "http", so if
 // protocol registration in general requires elevation, this does as well.
 bool DefaultBrowserInfoBarDelegate::OKButtonTriggersUACPrompt() const {
   return shell_integration::IsElevationNeededForSettingDefaultProtocolClient();
 }
 
 bool DefaultBrowserInfoBarDelegate::Accept() {
@@ skipping 15 matching lines @@
     close_infobar = false;
   }
 
   // The worker pointer is reference counted. While it is running, the
   // message loops of the FILE and UI thread will hold references to it
   // and it will be automatically freed once all its tasks have finished.
   CreateDefaultBrowserWorker(set_as_default_callback)->StartSetAsDefault();
   return close_infobar;
 }
 
-bool DefaultBrowserInfoBarDelegate::Cancel() {
-  // This can get reached in tests where profile_ is null.
-  if (profile_)
-    chrome::DefaultBrowserPromptDeclined(profile_);
-  content::RecordAction(
-      base::UserMetricsAction("DefaultBrowserInfoBar_Cancel"));
-  UMA_HISTOGRAM_ENUMERATION("DefaultBrowser.InfoBar.UserInteraction",
-                            CANCEL_INFO_BAR,
-                            NUM_INFO_BAR_USER_INTERACTION_TYPES);
-  return true;
-}
-
 scoped_refptr<shell_integration::DefaultBrowserWorker>
 DefaultBrowserInfoBarDelegate::CreateDefaultBrowserWorker(
     const shell_integration::DefaultWebClientWorkerCallback& callback) {
   return new shell_integration::DefaultBrowserWorker(callback);
 }
 
 void DefaultBrowserInfoBarDelegate::OnSetAsDefaultFinished(
     shell_integration::DefaultWebClientState state) {
   infobar()->owner()->RemoveInfoBar(infobar());
 }
 
 }  // namespace chrome