Refactor the FirstRun code into Windows-specific and portable.

BUG=11971
TEST=fresh install of Chrome should still bring up the first run dialog

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

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

1 files changed, 20 insertions, 8 deletions

diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 63f27da..de4babc 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -135,17 +135,18 @@ bool ShellIntegration::IsDefaultBrowser() {
 
 //--------------------------------------------------------------------------
 
-#if defined(OS_LINUX)
-// static
-bool FirstRun::IsChromeFirstRun() {
-  // http://code.google.com/p/chromium/issues/detail?id=11971
-  return false;
-}
 
+#if defined(OS_LINUX)
 void OpenFirstRunDialog(Profile* profile, ProcessSingleton* process_singleton) {
+  // http://code.google.com/p/chromium/issues/detail?id=11971
+  //
+  // Note that on Windows, this eventually calls into
+  // FirstRunViewBase::FirstRunComplete, which then creates the First
+  // Run sentinel.  We should refactor that out into the caller of
+  // this function.
   NOTIMPLEMENTED();
 }
-#endif  // defined(OS_LINUX)
+#endif
 
 // static
 bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
@@ -153,7 +154,8 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
                                         int* preference_details,
                                         std::vector<std::wstring>* new_tabs) {
   // http://code.google.com/p/chromium/issues/detail?id=11971
-  return false;
+  // Pretend we processed them correctly.
+  return true;
 }
 
 // static
@@ -162,6 +164,16 @@ int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
   return 0;
 }
 
+bool FirstRun::CreateChromeDesktopShortcut() {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool FirstRun::CreateChromeQuickLaunchShortcut() {
+  NOTIMPLEMENTED();
+  return false;
+}
+
 // static
 bool Upgrade::IsBrowserAlreadyRunning() {
   // http://code.google.com/p/chromium/issues/detail?id=9295