Fixes bug where triggering session restore while the browser was...

chrome/browser/browser_init.cc

 // Copyright (c) 2009 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"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/event_recorder.h"
 #include "base/path_service.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/sessions/session_restore.h"
+#include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/status_icons/status_tray_manager.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 441 matching lines @@
     webkit_glue::SetUserAgent(command_line_.GetSwitchValueASCII(
         switches::kUserAgent));
   }
 
   // Open the required browser windows and tabs.
   // First, see if we're being run as an application window.
   if (!OpenApplicationWindow(profile)) {
     std::vector<GURL> urls_to_open = GetURLsFromCommandLine(profile_);
     RecordLaunchModeHistogram(urls_to_open.empty()?
                               LM_TO_BE_DECIDED : LM_WITH_URLS);
-
     // TODO(viettrungluu): Temporary: Display a EULA before allowing the user to
     // actually enable Flash, unless they've already accepted it. Process this
     // in the same way as command-line URLs.
     FilePath flash_path;
     if (command_line_.HasSwitch(switches::kEnableInternalFlash) &&
         PathService::Get(chrome::FILE_FLASH_PLUGIN, &flash_path)) {
       PrefService* prefs = profile->GetPrefs();
       // Check whether the EULA has previously been accepted, defaulting to
       // "no". If it hasn't, display a page which links to the EULA, etc. (This
       // pref is registered by the plugin service.)
       if (!prefs->GetBoolean(prefs::kPluginsFlashAuthorized)) {
         urls_to_open.push_back(
             GURL(chrome::kChromeUIPluginsAuthorizeFlashPathURL));
       }
     }
 
-    if (!process_startup || !OpenStartupURLs(urls_to_open)) {
-      // Add the home page and any special first run URLs.
-      Browser* browser = NULL;
-      if (urls_to_open.empty())
-        AddStartupURLs(&urls_to_open);
-      else if (!command_line_.HasSwitch(switches::kOpenInNewWindow))
-        browser = BrowserList::GetLastActive();
-
-      OpenURLsInBrowser(browser, process_startup, urls_to_open);
-    }
+    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.
     std::string app_id;
     if (IsAppLaunch(NULL, &app_id) && !app_id.empty()) {
       // TODO(erikkay): This could fail if |app_id| is invalid (the app was
       // uninstalled).  We may want to show some reasonable error here.
       Browser::OpenApplication(profile, app_id);
     }
 
@@ skipping 92 matching lines @@
         ChildProcessSecurityPolicy::GetInstance();
     if (policy->IsWebSafeScheme(url.scheme()) ||
         url.SchemeIs(chrome::kFileScheme)) {
       Browser::OpenApplicationWindow(profile, url, false);
       return true;
     }
   }
   return false;
 }
 
-bool BrowserInit::LaunchWithProfile::OpenStartupURLs(
+void BrowserInit::LaunchWithProfile::ProcessLaunchURLs(
+    bool process_startup,
+    const std::vector<GURL>& urls_to_open) {
+  if (process_startup && ProcessStartupURLs(urls_to_open)) {
+    // ProcessStartupURLs processed the urls, nothing else to do.
+    return;
+  }
+
+  if (!process_startup &&
+      (profile_->GetSessionService() &&
+       profile_->GetSessionService()->RestoreIfNecessary(urls_to_open))) {
+    // We're already running and session restore wanted to run. This can happen
+    // at various point, such as if there is only an app window running and the

[brettw, 2010/03/26 00:33:32]

grammar: point -> points

+    // user double clicked the chrome icon. Return so we don't open the urls.
+    return;
+  }
+
+  // Session restore didn't occur, open the urls.
+
+  Browser* browser = NULL;
+  std::vector<GURL> adjust_urls = urls_to_open;
+  if (adjust_urls.empty())
+    AddStartupURLs(&adjust_urls);
+  else if (!command_line_.HasSwitch(switches::kOpenInNewWindow))
+    browser = BrowserList::GetLastActive();
+
+  OpenURLsInBrowser(browser, process_startup, adjust_urls);
+}
+
+bool BrowserInit::LaunchWithProfile::ProcessStartupURLs(
     const std::vector<GURL>& urls_to_open) {
   SessionStartupPref pref = GetSessionStartupPref(command_line_, profile_);
   if (command_line_.HasSwitch(switches::kTestingChannelID) &&
       !command_line_.HasSwitch(switches::kRestoreLastSession) &&
       browser_defaults::kDefaultSessionStartupType !=
       SessionStartupPref::DEFAULT) {
     // When we have non DEFAULT session start type, then we won't open up a
     // fresh session. But none of the tests are written with this in mind, so
     // we explicitly ignore it during testing.
     return false;
@@ skipping 367 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);
 }