Remove custom delegates and replace with Generic EventHandler<>'s

Conflicts:
	CefSharp.WinForms/ChromiumWebBrowser.cs

CefSharp.WinForms/ChromiumWebBrowser.cs

@@ -118,13 +118,13 @@ public object EvaluateScript(string script, TimeSpan? timeout)
             return managedCefBrowserAdapter.EvaluateScript(script, timeout.Value);
         }
 
-        public event LoadErrorEventHandler LoadError;
-        public event FrameLoadStartEventHandler FrameLoadStart;
-        public event FrameLoadEndEventHandler FrameLoadEnd;
-        public event NavStateChangedEventHandler NavStateChanged;
-        public event ConsoleMessageEventHandler ConsoleMessage;
-        public event AddressChangedEventHandler AddressChanged;
-        public event TitleChangedEventHandler TitleChanged;
+        public event EventHandler<LoadErrorEventArgs> LoadError;
+        public event EventHandler<FrameLoadStartEventArgs> FrameLoadStart;
+        public event EventHandler<FrameLoadEndEventArgs> FrameLoadEnd;
+        public event EventHandler<NavStateChangedEventArgs> NavStateChanged;
+        public event EventHandler<ConsoleMessageEventArgs> ConsoleMessage;
+        public event EventHandler<AddressChangedEventArgs> AddressChanged;
+        public event EventHandler<TitleChangedEventArgs> TitleChanged;
         public event IsBrowserInitializedChangedEventHandler IsBrowserInitializedChanged;
         public event IsLoadingChangedEventHandler IsLoadingChanged;
 

CefSharp.Wpf/ChromiumWebBrowser.cs

@@ -50,10 +50,10 @@ public class ChromiumWebBrowser : ContentControl, IRenderWebBrowser, IWpfWebBrow
         public IDownloadHandler DownloadHandler { get; set; }
         public ILifeSpanHandler LifeSpanHandler { get; set; }
 
-        public event ConsoleMessageEventHandler ConsoleMessage;
-        public event FrameLoadStartEventHandler FrameLoadStart;
-        public event FrameLoadEndEventHandler FrameLoadEnd;
-        public event LoadErrorEventHandler LoadError;
+        public event EventHandler<ConsoleMessageEventArgs> ConsoleMessage;
+        public event EventHandler<FrameLoadStartEventArgs> FrameLoadStart;
+        public event EventHandler<FrameLoadEndEventArgs> FrameLoadEnd;
+        public event EventHandler<LoadErrorEventArgs> LoadError;
 
         public ICommand BackCommand { get; private set; }
         public ICommand ForwardCommand { get; private set; }

CefSharp/AddressChangedEventArgs.cs

@@ -17,12 +17,5 @@ public AddressChangedEventArgs(string address)
         {
             Address = address;
         }
-    };
-
-    /// <summary>
-    /// A delegate type used to listen to AddressChanged events.
-    /// </summary>
-    /// <param name="sender">The object that raised the event.</param>
-    /// <param name="e">The event arguments.</param>
-    public delegate void AddressChangedEventHandler(object sender, AddressChangedEventArgs e);
+    }
 }

CefSharp/CefSharp.csproj

@@ -97,7 +97,6 @@
     <Compile Include="LoadErrorEventArgs.cs" />
     <Compile Include="FrameLoadStartEventArgs.cs" />
     <Compile Include="KeyType.cs" />
-    <Compile Include="LoadErrorEventHandler.cs" />
     <Compile Include="NavStateChangedEventArgs.cs" />
     <Compile Include="ICompletionHandler.cs" />
     <Compile Include="Internals\BitmapInfo.cs" />

CefSharp/ConsoleMessageEventArgs.cs

@@ -33,11 +33,4 @@ public ConsoleMessageEventArgs(string message, string source, int line)
         /// </summary>
         public int Line { get; private set; }
     }
-
-    /// <summary>
-    /// A delegate type used to listen to ConsoleMessage events.
-    /// </summary>
-    /// <param name="sender">The object that raised the event.</param>
-    /// <param name="e">The event arguments.</param>
-    public delegate void ConsoleMessageEventHandler(object sender, ConsoleMessageEventArgs e);
 }

CefSharp/FrameLoadEndEventArgs.cs

@@ -32,12 +32,5 @@ public FrameLoadEndEventArgs(string url, bool isMainFrame, int httpStatusCode)
         /// Http Status Code
         /// </summary>
         public int HttpStatusCode { get; set; }
-    };
-
-    /// <summary>
-    /// A delegate type used to listen to FrameLoadEnd events.
-    /// </summary>
-    /// <param name="sender">The object that raised the event.</param>
-    /// <param name="e">The event arguments.</param>
-    public delegate void FrameLoadEndEventHandler(object sender, FrameLoadEndEventArgs e);
+    }
 }

CefSharp/FrameLoadStartEventArgs.cs

@@ -26,12 +26,5 @@ public FrameLoadStartEventArgs(string url, bool isMainFrame)
         /// Is this the Main Frame
         /// </summary>
         public bool IsMainFrame { get; private set; }
-    };
-
-    /// <summary>
-    /// A delegate type used to listen to FrameLoadStart events.
-    /// </summary>
-    /// <param name="sender">The object that raised the event.</param>
-    /// <param name="e">The event arguments.</param>
-    public delegate void FrameLoadStartEventHandler(object sender, FrameLoadStartEventArgs e);
+    }
 }

CefSharp/IWebBrowser.cs

@@ -12,27 +12,27 @@ public interface IWebBrowser : IDisposable
         /// <summary>
         /// Event handler for receiving Javascript console messages being sent from web pages.
         /// </summary>
-        event ConsoleMessageEventHandler ConsoleMessage;
+        event EventHandler<ConsoleMessageEventArgs> ConsoleMessage;
 
         /// <summary>
         /// Event handler that will get called when the browser begins loading a frame. Multiple frames may be loading at the same
         /// time. Sub-frames may start or continue loading after the main frame load has ended. This method may not be called for a
         /// particular frame if the load request for that frame fails. For notification of overall browser load status use
         /// OnLoadingStateChange instead.
         /// </summary>
-        event FrameLoadStartEventHandler FrameLoadStart;
+        event EventHandler<FrameLoadStartEventArgs> FrameLoadStart;
 
         /// <summary>
         /// Event handler that will get called when the browser is done loading a frame. Multiple frames may be loading at the same
         /// time. Sub-frames may start or continue loading after the main frame load has ended. This method will always be called
         /// for all frames irrespective of whether the request completes successfully.
         /// </summary>
-        event FrameLoadEndEventHandler FrameLoadEnd;
+        event EventHandler<FrameLoadEndEventArgs> FrameLoadEnd;
 
         /// <summary>
         /// Event handler that will get called when the resource load for a navigation fails or is canceled.
         /// </summary>
-        event LoadErrorEventHandler LoadError;
+        event EventHandler<LoadErrorEventArgs> LoadError;
 
         /// <summary>
         /// Loads the specified URL.

CefSharp/NavStateChangedEventArgs.cs

@@ -21,12 +21,5 @@ public NavStateChangedEventArgs(bool canGoBack, bool canGoForward, bool canReloa
             CanGoForward = canGoForward;
             CanReload = canReload;
         }
-    };
-
-    /// <summary>
-    /// A delegate type used to listen to NavStateChanged events.
-    /// </summary>
-    /// <param name="sender">The object that raised the event.</param>
-    /// <param name="e">The event arguments.</param>
-    public delegate void NavStateChangedEventHandler(object sender, NavStateChangedEventArgs e);
+    }
 }

CefSharp/TitleChangedEventArgs.cs

@@ -17,12 +17,5 @@ public TitleChangedEventArgs(string title)
         {
             Title = title;
         }
-    };
-
-    /// <summary>
-    /// A delegate type used to listen to TitleChanged events.
-    /// </summary>
-    /// <param name="sender">The object that raised the event.</param>
-    /// <param name="e">The event arguments.</param>
-    public delegate void TitleChangedEventHandler(object sender, TitleChangedEventArgs e);
+    }
 }