Fix for Visual Studio prompting for $(CHROME_PATH)

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs

 // Copyright (c) 2012 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.
 
 namespace NativeClientVSAddIn
 {
   using System;
 
   using EnvDTE;
   using EnvDTE80;
@@ skipping 156 matching lines @@
     /// to save some specific properties into the project file to get around issue 140162.
     /// </summary>
     private void PerformPropertyModifications()
     {
       string naclAddInVersion = GetAddInMajorVersion().ToString();
 
       var configs = Utility.GetPlatformVCConfigurations(dte_, Strings.PepperPlatformName);
       configs.AddRange(Utility.GetPlatformVCConfigurations(dte_, Strings.NaCl64PlatformName));
       configs.AddRange(Utility.GetPlatformVCConfigurations(dte_, Strings.NaCl32PlatformName));
 
+
       var properties = new PropertyManager();
       foreach (VCConfiguration config in configs)
       {
         properties.SetTarget(config);
-        if (properties.NaClAddInVersion != naclAddInVersion)
+
+        IVCRulePropertyStorage debugger = config.Rules.Item("WindowsLocalDebugger");
+        string executable = debugger.GetUnevaluatedPropertyValue("LocalDebuggerCommand");
+
+        // Perform project modifications of the NaClAddInVersion in the project file
+        // is out of date, or if the WindowsLocalDebugger contains CHROME_PATH.  The
+        // later can happen if the developer deletes the .user file.
+        if (executable.Contains("$(CHROME_PATH)") || properties.NaClAddInVersion != naclAddInVersion)
         {
           Debug.WriteLine("Modifying Config: " + config.Name);
 
           // Set the NaCl add-in version so that it is stored in the project file.
           properties.SetProperty("ConfigurationGeneral", "NaClAddInVersion", naclAddInVersion);
 
           // Expand the CHROME_PATH variable to its full path.
           string expandedChrome = properties.GetProperty(
               "WindowsLocalDebugger", "LocalDebuggerCommand");
           properties.SetProperty("WindowsLocalDebugger", "LocalDebuggerCommand", expandedChrome);
@@ skipping 26 matching lines @@
       }
     }
 
     /// <summary>
     /// Takes a project configuration and sets values in the project file to work around some
     /// problems in Visual Studio. This is a work around for issue 140162.
     /// </summary>
     /// <param name="config">A configuration that needs modification.</param>
     private void PerformPropertyFixes(VCConfiguration config)
     {
-      IVCRulePropertyStorage debugger = config.Rules.Item("WindowsLocalDebugger");
-
       // NaCl Platform Specific:
       if (PropertyManager.IsNaClPlatform(config.Platform.Name))
       {
         IVCRulePropertyStorage general = config.Rules.Item("ConfigurationGeneral");
         string[] keys = {"VSNaClSDKRoot"};
         Dictionary<string, string> values = new Dictionary<string, string>();
         foreach (var key in keys)
         {
           values[key] = general.GetUnevaluatedPropertyValue(key);
           general.DeleteProperty(key);
@@ skipping 72 matching lines @@
         }
         else if (properties.ProjectPlatform == PropertyManager.ProjectPlatformType.Pepper)
         {
           debugger_ = new PluginDebuggerVS(dte_, properties);
           webServer_ = new WebServer(webServerOutputPane_, properties);
         }
       }
     }
   }
 }