Ensure we have a valid profile when using BrowserInit::LaunchWithProfile::Ope...

chrome/browser/browser_init.cc

 // Copyright (c) 2006-2008 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/browser_init.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
 #include "app/l10n_util.h"
@@ skipping 359 matching lines @@
   return in_startup;
 }
 
 // LaunchWithProfile ----------------------------------------------------------
 
 BrowserInit::LaunchWithProfile::LaunchWithProfile(
     const std::wstring& cur_dir,
     const CommandLine& command_line)
         : cur_dir_(cur_dir),
           command_line_(command_line),
+          profile_(NULL),
           browser_init_(NULL) {
 }
 
 BrowserInit::LaunchWithProfile::LaunchWithProfile(
     const std::wstring& cur_dir,
     const CommandLine& command_line,
     BrowserInit* browser_init)
         : cur_dir_(cur_dir),
           command_line_(command_line),
+          profile_(NULL),
           browser_init_(browser_init) {
 }
 
 bool BrowserInit::LaunchWithProfile::Launch(Profile* profile,
                                             bool process_startup) {
   DCHECK(profile);
   profile_ = profile;
 
   if (command_line_.HasSwitch(switches::kDnsLogDetails))
     chrome_browser_net::EnableDnsDetailedLog(true);
@@ skipping 148 matching lines @@
     default:
       return false;
   }
 }
 
 Browser* BrowserInit::LaunchWithProfile::OpenURLsInBrowser(
     Browser* browser,
     bool process_startup,
     const std::vector<GURL>& urls) {
   DCHECK(!urls.empty());
+  // If we don't yet have a profile, try to use the one we're given from
+  // |browser|. While we may not end up actually using |browser| (since it
+  // could be a popup window), we can at least use the profile.
+  if (!profile_ && browser)
+    profile_ = browser->profile();
+
   int pin_count = 0;
   if (!browser) {
     std::wstring pin_count_string =
         command_line_.GetSwitchValue(switches::kPinnedTabCount);
     if (!pin_count_string.empty())
       pin_count = StringToInt(WideToUTF16Hack(pin_count_string));
   }
-  if (!browser || browser->type() != Browser::TYPE_NORMAL)
-    browser = Browser::Create(profile_);
-
+  if (!browser || browser->type() != Browser::TYPE_NORMAL) {
+    // Try to find an existing "normal" browser. If one does not exist, create
+    // one.
+    browser = BrowserList::FindBrowserWithType(profile_, Browser::TYPE_NORMAL);
+    if (!browser || !browser->GetSelectedTabContents())
+      browser = Browser::Create(profile_);
+  }
   for (size_t i = 0; i < urls.size(); ++i) {
     TabContents* tab = browser->AddTabWithURL(
         urls[i], GURL(), PageTransition::START_PAGE, (i == 0), -1, false, NULL);
     if (i < static_cast<size_t>(pin_count))
       browser->tabstrip_model()->SetTabPinned(browser->tab_count() - 1, true);
     if (i == 0 && process_startup && !browser_defaults::kSuppressCrashInfoBar)
       AddCrashedInfoBarIfNecessary(tab);
   }
   browser->window()->Show();
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
@@ skipping 255 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }