Make the toast more reliable and less dangerous...

chrome/browser/first_run/first_run.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 227 matching lines @@
   // SwapNewChromeExeIfPresent, to perform the rename and relaunch of
   // the browser. Note that relaunch does NOT exit the existing browser process.
   // If this is called before message loop is executed, simply exit the main
   // function. If browser is already running, you will need to exit it.
   static bool DoUpgradeTasks(const CommandLine& command_line);
 
   // Shows a modal dialog asking the user to give chrome another try. See
   // above for the possible outcomes of the function. This is an experimental,
   // non-localized dialog.
   // |version| can be 0, 1 or 2 and selects what strings to present.
-  static TryResult ShowTryChromeDialog(size_t version);
+  // |process_singleton| needs to be valid and it will be locked while
+  // the dialog is shown.
+  static TryResult ShowTryChromeDialog(size_t version,
+                                       ProcessSingleton* process_singleton);
 #endif  // OS_WIN
 
   // Launches chrome again simulating a 'user' launch. If chrome could not
   // be launched the return is false.
   static bool RelaunchChromeBrowser(const CommandLine& command_line);
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   static void SaveLastModifiedTimeOfExe();
 #endif
 
@@ skipping 55 matching lines @@
   virtual void ImportCompleted() OVERRIDE;
   virtual void ImportCanceled() OVERRIDE;
 
   bool loop_running_;
   int import_result_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunImportObserver);
 };
 
 #endif  // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_