Do not create shortcuts on Windows if the "no-first-run" switch is on.

chrome/browser/profiles/profile_manager.cc

 // 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.
 
 #include <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 196 matching lines @@
   registrar_.Add(
       this,
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::NotificationService::AllSources());
 #endif
 }
 
 ProfileManager::~ProfileManager() {
   BrowserList::RemoveObserver(this);
 #if defined(OS_WIN)
-  profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get());
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (!command_line.HasSwitch(switches::kNoFirstRun))

[robertshield, 2011/11/30 20:07:48]

I would replace the condition with 
if (profile_shortcut_manager_.get()) {}

What we really want to do is remove the profile_shortcut_manager_ from the
observer list if it exists.

[Miranda Callahan, 2011/11/30 20:18:24]

Indeed! Fixed.

+    profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get());
 #endif
 }
 
 FilePath ProfileManager::GetDefaultProfileDir(
     const FilePath& user_data_dir) {
   FilePath default_profile_dir(user_data_dir);
   default_profile_dir =
       default_profile_dir.AppendASCII(chrome::kInitialProfile);
   return default_profile_dir;
 }
@@ skipping 358 matching lines @@
   } else {
     return pair1.first < pair2.first;
   }
 }
 
 ProfileInfoCache& ProfileManager::GetProfileInfoCache() {
   if (!profile_info_cache_.get()) {
     profile_info_cache_.reset(new ProfileInfoCache(
         g_browser_process->local_state(), user_data_dir_));
 #if defined(OS_WIN)
-    profile_shortcut_manager_.reset(new ProfileShortcutManagerWin());
-    profile_info_cache_->AddObserver(profile_shortcut_manager_.get());
+    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+    if (!command_line.HasSwitch(switches::kNoFirstRun)) {
+      profile_shortcut_manager_.reset(new ProfileShortcutManagerWin());
+      profile_info_cache_->AddObserver(profile_shortcut_manager_.get());
+    }
 #endif
   }
   return *profile_info_cache_.get();
 }
 
 void ProfileManager::AddProfileToCache(Profile* profile) {
   ProfileInfoCache& cache = GetProfileInfoCache();
   if (profile->GetPath().DirName() != cache.GetUserDataDir())
     return;
 
@@ skipping 97 matching lines @@
   RegisterProfile(profile, true);
   if (add_to_cache)
     AddProfileToCache(profile);
 }
 
 #if defined(OS_WIN)
 void ProfileManager::RemoveProfileShortcutManagerForTesting() {
   profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get());
 }
 #endif