Let IViewContent decide whether it should close together with the solution

src/AddIns/BackendBindings/Scripting/Test/Utils/MockViewContent.cs

@@ -47,6 +47,12 @@ namespace ICSharpCode.Scripting.Tests.Utils
 			}
 		}
 		
+		public bool CloseWithSolution {
+			get {
+				throw new NotImplementedException();
+			}
+		}
+		
 		public ICollection<IViewContent> SecondaryViewContents {
 			get { return secondaryViewContents;	}
 		}

src/AddIns/BackendBindings/WixBinding/Test/Utils/MockViewContent.cs

@@ -141,6 +141,10 @@ namespace WixBinding.Tests.Utils
 			}
 		}
 		
+		public bool CloseWithSolution {
+			get { throw new NotImplementedException(); }
+		}
+		
 		public bool IsDirty {
 			get {
 				throw new NotImplementedException();

src/AddIns/BackendBindings/WixBinding/Test/Utils/MockWorkbench.cs

@@ -196,5 +196,10 @@ namespace WixBinding.Tests.Utils
 				throw new NotImplementedException();
 			}
 		}
+		
+		public bool CloseAllSolutionViews()
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockViewContent.cs

@@ -113,6 +113,10 @@ namespace XmlEditor.Tests.Utils
 			}
 		}
 		
+		public bool CloseWithSolution {
+			get { throw new NotImplementedException(); }
+		}
+		
 		public System.Collections.Generic.ICollection<IViewContent> SecondaryViewContents {
 			get {
 				throw new NotImplementedException();

src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockWorkbench.cs

@@ -201,5 +201,10 @@ namespace XmlEditor.Tests.Utils
 				throw new NotImplementedException();
 			}
 		}
+		
+		public bool CloseAllSolutionViews()
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs

@@ -54,6 +54,10 @@ namespace ICSharpCode.Reports.Addin.Test.Designer
 			}
 		}
 		
+		public bool CloseWithSolution {
+			get { throw new NotImplementedException(); }
+		}
+		
 		public ICollection<IViewContent> SecondaryViewContents {
 			get { return secondaryViewContents;	}
 		}

src/Main/Base/Project/Src/Gui/AbstractViewContent.cs

@@ -554,5 +554,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 		public virtual bool IsViewOnly {
 			get { return Files.Count == 0; }
 		}
+		
+		public virtual bool CloseWithSolution {
+			get {
+				var fileName = this.PrimaryFileName;
+				return fileName == null
+					|| Project.ProjectService.OpenSolution.FindProjectContainingFile(fileName) != null;
+			}
+		}
 	}
 }

src/Main/Base/Project/Src/Gui/IViewContent.cs

@@ -138,6 +138,11 @@ namespace ICSharpCode.SharpDevelop.Gui
 		/// </summary>
 		bool IsViewOnly { get; }
 		
+		/// <summary>
+		/// Gets whether this view content should be closed when the solution is closed.
+		/// </summary>
+		bool CloseWithSolution { get; }
+		
 		#region Secondary view content support
 		/// <summary>
 		/// Gets the collection that stores the secondary view contents.

src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs

@@ -436,34 +436,16 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		public bool CloseAllSolutionViews()
 		{
-			bool isSolutionWindow;
 			bool result = true;
 			
 			WorkbenchSingleton.AssertMainThread();
-			try
+			try {
-			{
 				closeAll = true;
-				foreach (IWorkbenchWindow window in this.WorkbenchWindowCollection.ToArray())
+				foreach (IWorkbenchWindow window in this.WorkbenchWindowCollection.ToArray()) {
-				{
+					if (window.ActiveViewContent != null && window.ActiveViewContent.CloseWithSolution)
-					isSolutionWindow = false;
+						result &= window.CloseWindow(false);
-					foreach (IViewContent content in window.ViewContents)
-					{
-						foreach (OpenedFile file in content.Files)
-						{
-							if (ProjectService.OpenSolution.FindProjectContainingFile(file.FileName) != null)
-							{
-								isSolutionWindow = true;
-								break;							
-							}
-						}
-					}
-					
-					if (isSolutionWindow)
-						result = window.CloseWindow(false) && result;
 				}
-			}
+			} finally {
-			finally
-			{
 				closeAll = false;
 				OnActiveWindowChanged(this, EventArgs.Empty);
 			}

src/Main/Base/Project/Src/Util/FakeXmlViewContent.cs

@@ -154,6 +154,12 @@ namespace ICSharpCode.SharpDevelop.Util
 			}
 		}
 		
+		bool IViewContent.CloseWithSolution {
+			get {
+				throw new NotImplementedException();
+			}
+		}
+		
 		System.Collections.Generic.ICollection<IViewContent> IViewContent.SecondaryViewContents {
 			get {
 				throw new NotImplementedException();