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

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 3307024: Remove one-time flags when restarting after update.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 3 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
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_shutdown.cc
===================================================================
--- chrome/browser/browser_shutdown.cc (revision 59914)
+++ chrome/browser/browser_shutdown.cc (working copy)
@@ -33,6 +33,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/chrome_plugin_lib.h"
+#include "chrome/common/switch_utils.h"
#include "net/predictor_api.h"
#if defined(OS_WIN)
@@ -176,6 +177,8 @@
scoped_ptr<CommandLine> new_cl(new CommandLine(old_cl.GetProgram()));
std::map<std::string, CommandLine::StringType> switches =
old_cl.GetSwitches();
+ // Remove the switches that shouldn't persist across restart.
+ switches::RemoveSwitchesForAutostart(&switches);
// Append the old switches to the new command line.
for (std::map<std::string, CommandLine::StringType>::const_iterator i =
switches.begin(); i != switches.end(); ++i) {
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698