diff options
Diffstat (limited to 'chrome/browser/first_run/first_run.cc')
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index e7a6fcc..6b9e650 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -598,9 +598,10 @@ bool IsChromeFirstRun() { const CommandLine* command_line = CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kForceFirstRun)) { internal::first_run_ = internal::FIRST_RUN_TRUE; - } else if (command_line->HasSwitch(switches::kNoFirstRun)) { + } else if (command_line->HasSwitch(switches::kCancelFirstRun)) { internal::first_run_ = internal::FIRST_RUN_CANCEL; - } else if (internal::GetFirstRunSentinelFilePath(&first_run_sentinel) && + } else if (!command_line->HasSwitch(switches::kNoFirstRun) && + internal::GetFirstRunSentinelFilePath(&first_run_sentinel) && !base::PathExists(first_run_sentinel)) { internal::first_run_ = internal::FIRST_RUN_TRUE; } @@ -608,6 +609,11 @@ bool IsChromeFirstRun() { return internal::first_run_ == internal::FIRST_RUN_TRUE; } +bool IsFirstRunSuppressed(const CommandLine& command_line) { + return command_line.HasSwitch(switches::kCancelFirstRun) || + command_line.HasSwitch(switches::kNoFirstRun); +} + void CreateSentinelIfNeeded() { if (IsChromeFirstRun() || internal::first_run_ == internal::FIRST_RUN_CANCEL) { |