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 51 matching lines @@
   // We want the info-bar to stick-around for few seconds and then be hidden
   // on the next navigation after that.
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&DefaultBrowserInfoBarDelegate::AllowExpiry,
                             weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(8));
 }
 
 DefaultBrowserInfoBarDelegate::~DefaultBrowserInfoBarDelegate() {
   if (!action_taken_) {
     UMA_HISTOGRAM_ENUMERATION("DefaultBrowser.InfoBar.UserInteraction",

[grt (UTC plus 2), 2016/07/14 18:54:16]

nit: use content::RecordAction here as well

[Patrick Monette, 2016/07/14 19:40:58]

Done.

                               IGNORE_INFO_BAR,
                               NUM_INFO_BAR_USER_INTERACTION_TYPES);
   }
 }
 
 void DefaultBrowserInfoBarDelegate::AllowExpiry() {
   should_expire_ = true;
 }
 
 infobars::InfoBarDelegate::Type DefaultBrowserInfoBarDelegate::GetInfoBarType()
@@ skipping 45 matching lines @@
 }
 #endif  // defined(OS_WIN)
 
 bool DefaultBrowserInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   return should_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details);
 }
 
 void DefaultBrowserInfoBarDelegate::InfoBarDismissed() {
   action_taken_ = true;
+  // This can get reached in tests where profile_ is null.
+  if (profile_)
+    chrome::DefaultBrowserPromptDeclined(profile_);
   content::RecordAction(
       base::UserMetricsAction("DefaultBrowserInfoBar_Dismiss"));
   UMA_HISTOGRAM_ENUMERATION("DefaultBrowser.InfoBar.UserInteraction",
                             DISMISS_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

[grt (UTC plus 2), 2016/07/14 18:54:16]

i think we're clear to remove this in a separate CL. do you have cycles to take
care of that?

[Patrick Monette, 2016/07/14 19:40:58]

Sure!

           : 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 16 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() {
-  action_taken_ = true;
-  // 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