Fixes two session restore bugs:...

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"
 
 #include <shellapi.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 97 matching lines @@
   *result = IsWindowVisible(window) != 0;
   // Stops enumeration if a visible window has been found.
   return !*result;
 }
 
 SessionStartupPref GetSessionStartupPref(Profile* profile,
                                          const CommandLine& command_line) {
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile);
   if (command_line.HasSwitch(switches::kRestoreLastSession))
     pref.type = SessionStartupPref::LAST;
+  if (command_line.HasSwitch(switches::kIncognito) &&
+      pref.type == SessionStartupPref::LAST) {
+    // We don't store session information when incognito. If the user has
+    // chosen to restore last session and launched incognito, fallback to
+    // default launch behavior.
+    pref.type = SessionStartupPref::DEFAULT;
+  }
   return pref;
 }
 
 }  // namespace
 
 // MessageWindow --------------------------------------------------------------
 
 static bool in_startup = false;
 
 // static
@@ skipping 411 matching lines @@
         urls[i], GURL(), PageTransition::START_PAGE, (i == 0), NULL);
     if (i == 0 && process_startup)
       AddCrashedInfoBarIfNecessary(tab);
   }
   browser->window()->Show();
   return browser;
 }
 
 void BrowserInit::LaunchWithProfile::AddCrashedInfoBarIfNecessary(
     TabContents* tab) {
-  if (!profile_->DidLastSessionExitCleanly()) {
+  // Assume that if the user is launching incognito they were previously
+  // running incognito so that we have nothing to restore from.
+  if (!profile_->DidLastSessionExitCleanly() &&
+      !profile_->IsOffTheRecord()) {
     // The last session didn't exit cleanly. Show an infobar to the user
     // so that they can restore if they want. The delegate deletes itself when
     // it is closed.
     tab->AddInfoBar(new SessionCrashedInfoBarDelegate(tab));
   }
 }
 
 std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine(
     const CommandLine& command_line, Profile* profile) {
   std::vector<GURL> urls;
@@ skipping 152 matching lines @@
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code != NULL) {
       *return_code = ResultCodes::INVALID_CMDLINE_URL;
     }
     return false;
   }
 
   return true;
 }