Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 2832503002: Fix double session-restore bug. (Closed)
Patch Set: Fix unittest. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 92e1e9bcbef548cfef54c3fc71bbd5c7e94bc40c..cf539f3c629457eed8fc277ec668a758e5fcee5a 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -648,8 +648,6 @@ void StartupBrowserCreatorImpl::ProcessLaunchUrlsUsingConsolidatedFlow(
behavior_options |= PROCESS_STARTUP;
if (is_post_crash_launch)
behavior_options |= IS_POST_CRASH_LAUNCH;
- if (command_line_.HasSwitch(switches::kRestoreLastSession))
- behavior_options |= HAS_RESTORE_SWITCH;
if (command_line_.HasSwitch(switches::kOpenInNewWindow))
behavior_options |= HAS_NEW_WINDOW_SWITCH;
if (!cmd_line_tabs.empty())
@@ -883,8 +881,8 @@ StartupBrowserCreatorImpl::DetermineBrowserOpenBehavior(
if (pref.type == SessionStartupPref::LAST) {
// Don't perform a session restore on a post-crash launch, as this could
- // cause a crash loop. These checks can be overridden by a switch.
- if (!(options & IS_POST_CRASH_LAUNCH) || (options & HAS_RESTORE_SWITCH))
+ // cause a crash loop.
+ if (!(options & IS_POST_CRASH_LAUNCH))
return BrowserOpenBehavior::SYNCHRONOUS_RESTORE;
}

Powered by Google App Engine
This is Rietveld 408576698