Make sure the Autolaunch infobar...

chrome/browser/ui/browser_init.cc

 // Copyright (c) 2011 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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/component_updater/flash_component_installer.h"
 #include "chrome/browser/component_updater/recovery_component_installer.h"
 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
@@ skipping 287 matching lines @@
 bool DefaultBrowserInfoBarDelegate::Cancel() {
   action_taken_ = true;
   UMA_HISTOGRAM_COUNTS("DefaultBrowserWarning.DontSetAsDefault", 1);
   // User clicked "Don't ask me again", remember that.
   prefs_->SetBoolean(prefs::kCheckDefaultBrowser, false);
   return true;
 }
 
 #if defined(OS_WIN)
 void CheckAutoLaunchCallback() {
-  if (!auto_launch_trial::IsInAutoLaunchGroup())
+  if (!auto_launch_trial::IsInAutoLaunchFieldTrial())
     return;
 
   Browser* browser = BrowserList::GetLastActive();
   TabContentsWrapper* tab = browser->GetSelectedTabContentsWrapper();
 
-  int infobar_shown =
-      tab->profile()->GetPrefs()->GetInteger(prefs::kShownAutoLaunchInfobar);
-  if (infobar_shown >= kMaxInfobarShown)
+  // Don't show the info-bar if there are already info-bars showing.
+  InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
+  if (infobar_helper->infobar_count() > 0)
     return;
 
-  InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
   infobar_helper->AddInfoBar(
       new AutolaunchInfoBarDelegate(infobar_helper,
       tab->profile()->GetPrefs()));
 }
 #endif
 
 void NotifyNotDefaultBrowserCallback() {
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return;  // Reached during ui tests.
@@ skipping 468 matching lines @@
                               LM_TO_BE_DECIDED : LM_WITH_URLS);
     ProcessLaunchURLs(process_startup, urls_to_open);
 
     // If this is an app launch, but we didn't open an app window, it may
     // be an app tab.
     OpenApplicationTab(profile);
 
     if (process_startup) {
       if (browser_defaults::kOSSupportsOtherBrowsers &&
           !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
-        CheckIfAutoLaunched(profile);
-
-        // Check whether we are the default browser.
-        CheckDefaultBrowser(profile);
+        if (!CheckIfAutoLaunched(profile)) {
+          // Check whether we are the default browser.
+          CheckDefaultBrowser(profile);
+        }
       }
 #if defined(OS_MACOSX)
       // Check whether the auto-update system needs to be promoted from user
       // to system.
       KeystoneInfoBar::PromotionInfoBar(profile);
 #endif
     }
   }
 
 #if defined(OS_WIN)
@@ skipping 588 matching lines @@
     } else {
       // TODO(pastarmovj): We can't really do anything meaningful here yet but
       // just prevent showing the infobar.
     }
     return;
   }
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE, base::Bind(&CheckDefaultBrowserCallback));
 }
 
-void BrowserInit::LaunchWithProfile::CheckIfAutoLaunched(Profile* profile) {
+bool BrowserInit::LaunchWithProfile::CheckIfAutoLaunched(Profile* profile) {
 #if defined(OS_WIN)
-  if (!auto_launch_trial::IsInAutoLaunchGroup())
-    return;
+  if (!auto_launch_trial::IsInAutoLaunchFieldTrial())
+    return false;
+
+  int infobar_shown =
+      profile->GetPrefs()->GetInteger(prefs::kShownAutoLaunchInfobar);
+  if (infobar_shown >= kMaxInfobarShown)
+    return false;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kAutoLaunchAtStartup)) {
+  if (command_line.HasSwitch(switches::kAutoLaunchAtStartup) ||
+      FirstRun::IsChromeFirstRun()) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             base::Bind(&CheckAutoLaunchCallback));
+    return true;
   }
+
+  return false;
 #endif
 }
 
 std::vector<GURL> BrowserInit::GetURLsFromCommandLine(
     const CommandLine& command_line,
     const FilePath& cur_dir,
     Profile* profile) {
   std::vector<GURL> urls;
   const CommandLine::StringVector& params = command_line.GetArgs();
 
@@ skipping 228 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL);
 }