Index: chrome/common/chrome_switches.cc |
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc |
index 2f63435aa5d4942688c346687fed2073dda3fb14..267867cfcf7296288c4cd76bcf89ca05e2e68496 100644 |
--- a/chrome/common/chrome_switches.cc |
+++ b/chrome/common/chrome_switches.cc |
@@ -700,11 +700,9 @@ const char kFeedbackServer[] = "feedback-server"; |
const char kFileDescriptorLimit[] = "file-descriptor-limit"; |
// Displays the First Run experience when the browser is started, regardless of |
-// whether or not it's actually the first run. |
-const char kFirstRun[] = "first-run"; |
- |
-// Force a profile auto-import that would occur on a first run. |
-const char kFirstRunForceImport[] = "first-run-force-import"; |
+// whether or not it's actually the first run (this overrides kNoFirstRun as far |
+// as first run tasks are concerned). |
+const char kForceFirstRun[] = "force-first-run"; |
// Enables using GAIA information to populate profile name and icon. |
const char kGaiaProfileInfo[] = "gaia-profile-info"; |
@@ -884,8 +882,7 @@ const char kNoEvents[] = "no-events"; |
// then restart chrome without this switch again. |
const char kNoExperiments[] = "no-experiments"; |
-// Whether or not it's actually the first run. Overrides kFirstRun in case |
-// you're for some reason tempted to pass them both. |
+// Whether or not it's actually the first run. Overridden by kForceFirstRun. |
const char kNoFirstRun[] = "no-first-run"; |
// Support a separate switch that enables the v8 playback extension. |