From 9e671737d4b178c9b787b274bfe593c78d521780 Mon Sep 17 00:00:00 2001 From: amaitland Date: Mon, 30 Jun 2014 14:12:20 +1000 Subject: [PATCH] Remove custom delegates and replace with Generic EventHandler<>'s Conflicts: CefSharp.WinForms/ChromiumWebBrowser.cs --- CefSharp.WinForms/ChromiumWebBrowser.cs | 14 +++++++------- CefSharp.Wpf/ChromiumWebBrowser.cs | 8 ++++---- CefSharp/AddressChangedEventArgs.cs | 9 +-------- CefSharp/CefSharp.csproj | 1 - CefSharp/ConsoleMessageEventArgs.cs | 7 ------- CefSharp/FrameLoadEndEventArgs.cs | 9 +-------- CefSharp/FrameLoadStartEventArgs.cs | 9 +-------- CefSharp/IWebBrowser.cs | 8 ++++---- CefSharp/LoadErrorEventHandler.cs | 13 ------------- CefSharp/NavStateChangedEventArgs.cs | 9 +-------- CefSharp/TitleChangedEventArgs.cs | 9 +-------- 11 files changed, 20 insertions(+), 76 deletions(-) delete mode 100644 CefSharp/LoadErrorEventHandler.cs diff --git a/CefSharp.WinForms/ChromiumWebBrowser.cs b/CefSharp.WinForms/ChromiumWebBrowser.cs index 670461620e..22e9e28c8e 100644 --- a/CefSharp.WinForms/ChromiumWebBrowser.cs +++ b/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 LoadError; + public event EventHandler FrameLoadStart; + public event EventHandler FrameLoadEnd; + public event EventHandler NavStateChanged; + public event EventHandler ConsoleMessage; + public event EventHandler AddressChanged; + public event EventHandler TitleChanged; public event IsBrowserInitializedChangedEventHandler IsBrowserInitializedChanged; public event IsLoadingChangedEventHandler IsLoadingChanged; diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs index 891918c61a..ba615b9c5b 100644 --- a/CefSharp.Wpf/ChromiumWebBrowser.cs +++ b/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 ConsoleMessage; + public event EventHandler FrameLoadStart; + public event EventHandler FrameLoadEnd; + public event EventHandler LoadError; public ICommand BackCommand { get; private set; } public ICommand ForwardCommand { get; private set; } diff --git a/CefSharp/AddressChangedEventArgs.cs b/CefSharp/AddressChangedEventArgs.cs index 67ef76b944..e437a179f7 100644 --- a/CefSharp/AddressChangedEventArgs.cs +++ b/CefSharp/AddressChangedEventArgs.cs @@ -17,12 +17,5 @@ public AddressChangedEventArgs(string address) { Address = address; } - }; - - /// - /// A delegate type used to listen to AddressChanged events. - /// - /// The object that raised the event. - /// The event arguments. - public delegate void AddressChangedEventHandler(object sender, AddressChangedEventArgs e); + } } diff --git a/CefSharp/CefSharp.csproj b/CefSharp/CefSharp.csproj index 7a61177a6c..32b276ae52 100644 --- a/CefSharp/CefSharp.csproj +++ b/CefSharp/CefSharp.csproj @@ -97,7 +97,6 @@ - diff --git a/CefSharp/ConsoleMessageEventArgs.cs b/CefSharp/ConsoleMessageEventArgs.cs index 8e7cba364e..96e8a20462 100644 --- a/CefSharp/ConsoleMessageEventArgs.cs +++ b/CefSharp/ConsoleMessageEventArgs.cs @@ -33,11 +33,4 @@ public ConsoleMessageEventArgs(string message, string source, int line) /// public int Line { get; private set; } } - - /// - /// A delegate type used to listen to ConsoleMessage events. - /// - /// The object that raised the event. - /// The event arguments. - public delegate void ConsoleMessageEventHandler(object sender, ConsoleMessageEventArgs e); } diff --git a/CefSharp/FrameLoadEndEventArgs.cs b/CefSharp/FrameLoadEndEventArgs.cs index d1cd617b71..9eaf8f8ac3 100644 --- a/CefSharp/FrameLoadEndEventArgs.cs +++ b/CefSharp/FrameLoadEndEventArgs.cs @@ -32,12 +32,5 @@ public FrameLoadEndEventArgs(string url, bool isMainFrame, int httpStatusCode) /// Http Status Code /// public int HttpStatusCode { get; set; } - }; - - /// - /// A delegate type used to listen to FrameLoadEnd events. - /// - /// The object that raised the event. - /// The event arguments. - public delegate void FrameLoadEndEventHandler(object sender, FrameLoadEndEventArgs e); + } } diff --git a/CefSharp/FrameLoadStartEventArgs.cs b/CefSharp/FrameLoadStartEventArgs.cs index b4804ab0cc..5accb9817b 100644 --- a/CefSharp/FrameLoadStartEventArgs.cs +++ b/CefSharp/FrameLoadStartEventArgs.cs @@ -26,12 +26,5 @@ public FrameLoadStartEventArgs(string url, bool isMainFrame) /// Is this the Main Frame /// public bool IsMainFrame { get; private set; } - }; - - /// - /// A delegate type used to listen to FrameLoadStart events. - /// - /// The object that raised the event. - /// The event arguments. - public delegate void FrameLoadStartEventHandler(object sender, FrameLoadStartEventArgs e); + } } diff --git a/CefSharp/IWebBrowser.cs b/CefSharp/IWebBrowser.cs index 26aa632bc1..f3941976c4 100644 --- a/CefSharp/IWebBrowser.cs +++ b/CefSharp/IWebBrowser.cs @@ -12,7 +12,7 @@ public interface IWebBrowser : IDisposable /// /// Event handler for receiving Javascript console messages being sent from web pages. /// - event ConsoleMessageEventHandler ConsoleMessage; + event EventHandler ConsoleMessage; /// /// Event handler that will get called when the browser begins loading a frame. Multiple frames may be loading at the same @@ -20,19 +20,19 @@ public interface IWebBrowser : IDisposable /// particular frame if the load request for that frame fails. For notification of overall browser load status use /// OnLoadingStateChange instead. /// - event FrameLoadStartEventHandler FrameLoadStart; + event EventHandler FrameLoadStart; /// /// 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. /// - event FrameLoadEndEventHandler FrameLoadEnd; + event EventHandler FrameLoadEnd; /// /// Event handler that will get called when the resource load for a navigation fails or is canceled. /// - event LoadErrorEventHandler LoadError; + event EventHandler LoadError; /// /// Loads the specified URL. diff --git a/CefSharp/LoadErrorEventHandler.cs b/CefSharp/LoadErrorEventHandler.cs deleted file mode 100644 index 9e0b7283f1..0000000000 --- a/CefSharp/LoadErrorEventHandler.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright © 2010-2014 The CefSharp 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 CefSharp -{ - /// - /// A delegate type used to listen to LoadError messages. - /// - /// The object that raised the event. - /// The event arguments. - public delegate void LoadErrorEventHandler(object sender, LoadErrorEventArgs e); -} \ No newline at end of file diff --git a/CefSharp/NavStateChangedEventArgs.cs b/CefSharp/NavStateChangedEventArgs.cs index 75379b1e07..47025251e0 100644 --- a/CefSharp/NavStateChangedEventArgs.cs +++ b/CefSharp/NavStateChangedEventArgs.cs @@ -21,12 +21,5 @@ public NavStateChangedEventArgs(bool canGoBack, bool canGoForward, bool canReloa CanGoForward = canGoForward; CanReload = canReload; } - }; - - /// - /// A delegate type used to listen to NavStateChanged events. - /// - /// The object that raised the event. - /// The event arguments. - public delegate void NavStateChangedEventHandler(object sender, NavStateChangedEventArgs e); + } } diff --git a/CefSharp/TitleChangedEventArgs.cs b/CefSharp/TitleChangedEventArgs.cs index 0b3c030549..1a8b912dfe 100644 --- a/CefSharp/TitleChangedEventArgs.cs +++ b/CefSharp/TitleChangedEventArgs.cs @@ -17,12 +17,5 @@ public TitleChangedEventArgs(string title) { Title = title; } - }; - - /// - /// A delegate type used to listen to TitleChanged events. - /// - /// The object that raised the event. - /// The event arguments. - public delegate void TitleChangedEventHandler(object sender, TitleChangedEventArgs e); + } }