Never show the default browser prompt over the first run promos

chrome/browser/ui/startup/default_browser_prompt.cc

 // Copyright (c) 2012 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_prompt.h"
 
 #include <limits>
 #include <string>
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/startup/default_browser_infobar_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
@@ skipping 16 matching lines @@
   if (!browser)
     return;  // Reached during ui tests.
 
   // In ChromeBot tests, there might be a race. This line appears to get
   // called during shutdown and |tab| can be NULL.
   content::WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return;
 
+  // Never show the default browser prompt over the first run promos.
+  // TODO(pmonette): The whole logic that determines when to show the default
+  // browser prompt is due for a refactor. ShouldShowDefaultBrowserPrompt()
+  // should be aware of the first run promos and return false instead of
+  // counting on the early return here. See bug crbug.com/693292.
+  if (first_run::IsOnWelcomePage(web_contents))
+    return;
+
   DefaultBrowserInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents), browser->profile());
 }
 
 // Returns true if the default browser prompt should be shown if Chrome is not
 // the user's default browser.
 bool ShouldShowDefaultBrowserPrompt(Profile* profile) {
   // Do not show the prompt if the "suppress_default_browser_prompt_for_version"
   // master preference is set to the current version.
   const std::string disable_version_string =
@@ skipping 81 matching lines @@
   profile->GetPrefs()->ClearPref(prefs::kDefaultBrowserLastDeclined);
 }
 
 #if !defined(OS_WIN)
 bool ShowFirstRunDefaultBrowserPrompt(Profile* profile) {
   return false;
 }
 #endif
 
 }  // namespace chrome