Renamed IIconImpl -> IWindowIconImpl

src/Android/Avalonia.Android/AndroidPlatform.cs

@@ -67,17 +67,17 @@ namespace Avalonia.Android
             throw new NotImplementedException();
         }
 
-        public IIconImpl LoadIcon(string fileName)
+        public IWindowIconImpl LoadIcon(string fileName)
         {
             return null;
         }
 
-        public IIconImpl LoadIcon(Stream stream)
+        public IWindowIconImpl LoadIcon(Stream stream)
         {
             return null;
         }
 
-        public IIconImpl LoadIcon(IBitmapImpl bitmap)
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
             return null;
         }

src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs

@@ -181,7 +181,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             Paint?.Invoke(new Rect(new Point(0, 0), ClientSize));
         }
 
-        public void SetIcon(IIconImpl icon)
+        public void SetIcon(IWindowIconImpl icon)
         {
             // No window icons for mobile platforms
         }

src/Avalonia.Controls/Avalonia.Controls.csproj

@@ -65,7 +65,7 @@
     <Compile Include="IVirtualizingPanel.cs" />
     <Compile Include="LayoutTransformControl.cs" />
     <Compile Include="Mixins\ContentControlMixin.cs" />
-    <Compile Include="Platform\IIconImpl.cs" />
+    <Compile Include="Platform\IWindowIconImpl.cs" />
     <Compile Include="Platform\IPlatformIconLoader.cs" />
     <Compile Include="Platform\ITopLevelRenderer.cs" />
     <Compile Include="Platform\IWindowingPlatform.cs" />

src/Avalonia.Controls/Platform/IIconImpl.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Avalonia.Platform
-{
-    public interface IIconImpl
-    {
-    }
-}

src/Avalonia.Controls/Platform/IPlatformIconLoader.cs

@@ -10,8 +10,8 @@ namespace Avalonia.Platform
 {
     public interface IPlatformIconLoader
     {
-        IIconImpl LoadIcon(string fileName);
+        IWindowIconImpl LoadIcon(string fileName);
-        IIconImpl LoadIcon(Stream stream);
+        IWindowIconImpl LoadIcon(Stream stream);
-        IIconImpl LoadIcon(IBitmapImpl bitmap);
+        IWindowIconImpl LoadIcon(IBitmapImpl bitmap);
     }
 }

src/Avalonia.Controls/Platform/IWindowIconImpl.cs

@@ -0,0 +1,9 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Platform
+{
+    public interface IWindowIconImpl
+    {
+    }
+}

src/Avalonia.Controls/Platform/IWindowImpl.cs

@@ -43,6 +43,6 @@ namespace Avalonia.Platform
         /// <summary>
         /// Sets the icon of this window.
         /// </summary>
-        void SetIcon(IIconImpl icon);
+        void SetIcon(IWindowIconImpl icon);
     }
 }

src/Avalonia.Controls/WindowIcon.cs

@@ -29,6 +29,6 @@ namespace Avalonia.Controls
             PlatformImpl = AvaloniaLocator.Current.GetService<IPlatformIconLoader>().LoadIcon(stream);
         }
 
-        public IIconImpl PlatformImpl { get; }
+        public IWindowIconImpl PlatformImpl { get; }
     }
 }

src/Gtk/Avalonia.Gtk/GtkPlatform.cs

@@ -115,17 +115,17 @@ namespace Avalonia.Gtk
             return new PopupImpl();
         }
 
-        public IIconImpl LoadIcon(string fileName)
+        public IWindowIconImpl LoadIcon(string fileName)
         {
             return new IconImpl(new Gdk.Pixbuf(fileName));
         }
 
-        public IIconImpl LoadIcon(Stream stream)
+        public IWindowIconImpl LoadIcon(Stream stream)
         {
             return new IconImpl(new Gdk.Pixbuf(stream));
         }
 
-        public IIconImpl LoadIcon(IBitmapImpl bitmap)
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
             if (bitmap is Gdk.Pixbuf)
             {

src/Gtk/Avalonia.Gtk/IconImpl.cs

@@ -8,7 +8,7 @@ using Gdk;
 
 namespace Avalonia.Gtk
 {
-    class IconImpl : IIconImpl
+    class IconImpl : IWindowIconImpl
     {
         public IconImpl(Pixbuf pixbuf)
         {

src/Gtk/Avalonia.Gtk/WindowImpl.cs

@@ -384,7 +384,7 @@ namespace Avalonia.Gtk
             return true;
         }
 
-        public void SetIcon(IIconImpl icon)
+        public void SetIcon(IWindowIconImpl icon)
         {
             Icon = ((IconImpl)icon).Pixbuf;
         }

src/Windows/Avalonia.Win32/IconImpl.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Avalonia.Win32
 {
-    class IconImpl : IIconImpl
+    class IconImpl : IWindowIconImpl
     {
         public IconImpl(System.Drawing.Bitmap iconBitmap)
         {

src/Windows/Avalonia.Win32/Win32Platform.cs

@@ -189,19 +189,19 @@ namespace Avalonia.Win32
             return new PopupImpl();
         }
 
-        public IIconImpl LoadIcon(string fileName)
+        public IWindowIconImpl LoadIcon(string fileName)
         {
             var icon = new System.Drawing.Bitmap(fileName);
             return new IconImpl(icon);
         }
 
-        public IIconImpl LoadIcon(Stream stream)
+        public IWindowIconImpl LoadIcon(Stream stream)
         {
             var icon = new System.Drawing.Bitmap(stream);
             return new IconImpl(icon);
         }
 
-        public IIconImpl LoadIcon(IBitmapImpl bitmap)
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
             using (var memoryStream = new MemoryStream())
             {

src/Windows/Avalonia.Win32/WindowImpl.cs

@@ -681,7 +681,7 @@ namespace Avalonia.Win32
             UnmanagedMethods.ShowWindow(_hwnd, command);
         }
 
-        public void SetIcon(IIconImpl icon)
+        public void SetIcon(IWindowIconImpl icon)
         {
             var impl = (IconImpl)icon;
             var nativeIcon = impl.IconBitmap;

src/iOS/Avalonia.iOS/AvaloniaView.cs

@@ -214,7 +214,7 @@ namespace Avalonia.iOS
             }
         }
 
-        public void SetIcon(IIconImpl icon)
+        public void SetIcon(IWindowIconImpl icon)
         {
         }
     }

src/iOS/Avalonia.iOS/PlatformIconLoader.cs

@@ -8,17 +8,17 @@ namespace Avalonia.iOS
 {
     class PlatformIconLoader : IPlatformIconLoader
     {
-        public IIconImpl LoadIcon(IBitmapImpl bitmap)
+        public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
             return null;
         }
 
-        public IIconImpl LoadIcon(Stream stream)
+        public IWindowIconImpl LoadIcon(Stream stream)
         {
             return null;
         }
 
-        public IIconImpl LoadIcon(string fileName)
+        public IWindowIconImpl LoadIcon(string fileName)
         {
             return null;
         }