Fix multiple instances of first run dialog appearing when Chrome is started again while a first run dialog is visible. Also cause the original first run dialog to come to foreground.

BUG=http://crbug.com/10765

Review URL: http://codereview.chromium.org/99281

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15170 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 2 deletions

diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 8d5e51c..ce88a70 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -166,7 +166,9 @@ bool Upgrade::SwapNewChromeExeIfPresent() {
   return true;
 }
 
-void OpenFirstRunDialog(Profile* profile) { NOTIMPLEMENTED(); }
+void OpenFirstRunDialog(Profile* profile, ProcessSingleton* process_singleton) {
+  NOTIMPLEMENTED();
+}
 
 //--------------------------------------------------------------------------
 
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 1b49f76..42ba4b4 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -30,6 +30,7 @@ class CommandLine;
 class DownloadItem;
 class MessageLoop;
 class NavigationController;
+class ProcessSingleton;
 class Profile;
 class RenderViewHostDelegate;
 class SiteInstance;
@@ -83,7 +84,7 @@ class GoogleUpdateSettings {
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
 };
 
-void OpenFirstRunDialog(Profile* profile);
+void OpenFirstRunDialog(Profile* profile, ProcessSingleton* process_singleton);
 
 void InstallJankometer(const CommandLine&);