SEBWIN-220: Moved all event handlers to separate files and namespaces.

SafeExamBrowser.Browser/BrowserApplicationController.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using CefSharp;
+using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Browser;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;

SafeExamBrowser.Browser/BrowserApplicationInstance.cs

@@ -8,6 +8,8 @@
 
 using System;
 using SafeExamBrowser.Browser.Handlers;
+using SafeExamBrowser.Contracts.Behaviour;
+using SafeExamBrowser.Contracts.Behaviour.Events;
 using SafeExamBrowser.Contracts.Browser;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.Configuration.Settings;
@@ -34,7 +36,7 @@ namespace SafeExamBrowser.Browser
 
 		public event DownloadRequestedEventHandler ConfigurationDownloadRequested;
 		public event NameChangedEventHandler NameChanged;
-		public event TerminatedEventHandler Terminated;
+		public event InstanceTerminatedEventHandler Terminated;
 
 		public BrowserApplicationInstance(
 			AppConfig appConfig,

SafeExamBrowser.Browser/BrowserControl.cs

@@ -11,6 +11,7 @@ using CefSharp.WinForms;
 using SafeExamBrowser.Browser.Handlers;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.UserInterface.Browser;
+using SafeExamBrowser.Contracts.UserInterface.Browser.Events;
 using BrowserSettings = SafeExamBrowser.Contracts.Configuration.Settings.BrowserSettings;
 
 namespace SafeExamBrowser.Browser

SafeExamBrowser.Client.UnitTests/Notifications/NotificationButtonMock.cs

@@ -7,6 +7,7 @@
  */
 
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 
 namespace SafeExamBrowser.Client.UnitTests.Notifications
 {

SafeExamBrowser.Contracts/Behaviour/Events/InstanceTerminatedEventHandler.cs

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+using System;
+
+namespace SafeExamBrowser.Contracts.Behaviour.Events
+{
+	/// <summary>
+	/// Event handler used to indicate that an application instance with a particular ID has terminated.
+	/// </summary>
+	public delegate void InstanceTerminatedEventHandler(Guid id);
+}

SafeExamBrowser.Contracts/Behaviour/Events/NameChangedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.Behaviour.Events
+{
+	/// <summary>
+	/// Event handler used to indicate that a name has changed to a new value.
+	/// </summary>
+	public delegate void NameChangedEventHandler(string name);
+}

SafeExamBrowser.Contracts/Behaviour/IApplicationInstance.cs

@@ -7,14 +7,11 @@
  */
 
 using System;
-using SafeExamBrowser.Contracts.UserInterface;
+using SafeExamBrowser.Contracts.Behaviour.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 
-namespace SafeExamBrowser.Contracts.Configuration
+namespace SafeExamBrowser.Contracts.Behaviour
 {
-	public delegate void TerminatedEventHandler(Guid id);
-	public delegate void NameChangedEventHandler(string name);
-
 	/// <summary>
 	/// Defines an instance of a (third-party) application which can be accessed via the <see cref="UserInterface.Taskbar.ITaskbar"/>.
 	/// </summary>
@@ -33,7 +30,7 @@ namespace SafeExamBrowser.Contracts.Configuration
 		/// <summary>
 		/// Event fired when the application instance has been terminated.
 		/// </summary>
-		event TerminatedEventHandler Terminated;
+		event InstanceTerminatedEventHandler Terminated;
 
 		/// <summary>
 		/// Event fired when the name or (document) title of the application instance has changed.

SafeExamBrowser.Contracts/Monitoring/Events/DisplayChangedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.Monitoring.Events
+{
+	/// <summary>
+	/// Indicates that the configuration of a display has changed.
+	/// </summary>
+	public delegate void DisplayChangedEventHandler();
+}

SafeExamBrowser.Contracts/Monitoring/Events/ExplorerStartedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.Monitoring.Events
+{
+	/// <summary>
+	/// Indicates that the Windows explorer process has started.
+	/// </summary>
+	public delegate void ExplorerStartedEventHandler();
+}

SafeExamBrowser.Contracts/Monitoring/Events/WindowChangedEventHandler.cs

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+using System;
+
+namespace SafeExamBrowser.Contracts.Monitoring.Events
+{
+	/// <summary>
+	/// Indicates that the input focus has changed to the window with the specified handle.
+	/// </summary>
+	public delegate void WindowChangedEventHandler(IntPtr window);
+}

SafeExamBrowser.Contracts/Monitoring/IDisplayMonitor.cs

@@ -6,10 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using SafeExamBrowser.Contracts.Monitoring.Events;
+
 namespace SafeExamBrowser.Contracts.Monitoring
 {
-	public delegate void DisplayChangedEventHandler();
-
 	/// <summary>
 	/// Monitors the displays of the computer for (setup) changes and provides access to display-related functionality.
 	/// </summary>

SafeExamBrowser.Contracts/Monitoring/IProcessMonitor.cs

@@ -7,19 +7,17 @@
  */
 
 using System;
+using SafeExamBrowser.Contracts.Monitoring.Events;
 
 namespace SafeExamBrowser.Contracts.Monitoring
 {
-	public delegate void ExplorerStartedEventHandler();
-
 	/// <summary>
 	/// Monitors the processes running on the computer and provides access to process-related functionality.
 	/// </summary>
 	public interface IProcessMonitor
 	{
 		/// <summary>
-		/// Event fired when the process monitor observes that a new instance of
-		/// the Windows explorer has been started.
+		/// Event fired when the process monitor observes that a new instance of the Windows explorer has been started.
 		/// </summary>
 		event ExplorerStartedEventHandler ExplorerStarted;
 
@@ -39,8 +37,8 @@ namespace SafeExamBrowser.Contracts.Monitoring
 		void StartExplorerShell();
 
 		/// <summary>
-		/// Starts monitoring the Windows explorer, i.e. any newly created instances of
-		/// <c>explorer.exe</c> will trigger the <c>ExplorerStarted</c> event.
+		/// Starts monitoring the Windows explorer, i.e. any newly created instances of <c>explorer.exe</c> will trigger the
+		/// <see cref="ExplorerStarted"/> event.
 		/// </summary>
 		void StartMonitoringExplorer();
 

SafeExamBrowser.Contracts/Monitoring/IWindowMonitor.cs

@@ -7,11 +7,10 @@
  */
 
 using System;
+using SafeExamBrowser.Contracts.Monitoring.Events;
 
 namespace SafeExamBrowser.Contracts.Monitoring
 {
-	public delegate void WindowChangedEventHandler(IntPtr window);
-
 	/// <summary>
 	/// Monitors the windows associated with the current desktop and provides window-related functionality.
 	/// </summary>

SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj

@@ -52,6 +52,8 @@
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Behaviour\Events\InstanceTerminatedEventHandler.cs" />
+    <Compile Include="Behaviour\Events\NameChangedEventHandler.cs" />
     <Compile Include="Behaviour\IApplicationController.cs" />
     <Compile Include="Behaviour\IRuntimeController.cs" />
     <Compile Include="Behaviour\OperationModel\IOperationSequence.cs" />
@@ -105,7 +107,7 @@
     <Compile Include="Behaviour\IClientController.cs" />
     <Compile Include="Configuration\IIconResource.cs" />
     <Compile Include="Configuration\IApplicationInfo.cs" />
-    <Compile Include="Configuration\IApplicationInstance.cs" />
+    <Compile Include="Behaviour\IApplicationInstance.cs" />
     <Compile Include="Configuration\INotificationInfo.cs" />
     <Compile Include="Configuration\ISystemInfo.cs" />
     <Compile Include="Configuration\OperatingSystem.cs" />
@@ -127,6 +129,9 @@
     <Compile Include="Logging\ILogText.cs" />
     <Compile Include="Logging\IThreadInfo.cs" />
     <Compile Include="Logging\LogLevel.cs" />
+    <Compile Include="Monitoring\Events\DisplayChangedEventHandler.cs" />
+    <Compile Include="Monitoring\Events\ExplorerStartedEventHandler.cs" />
+    <Compile Include="Monitoring\Events\WindowChangedEventHandler.cs" />
     <Compile Include="Monitoring\IDisplayMonitor.cs" />
     <Compile Include="Monitoring\IKeyboardInterceptor.cs" />
     <Compile Include="Monitoring\IMouseInterceptor.cs" />
@@ -140,11 +145,20 @@
     <Compile Include="SystemComponents\ISystemComponent.cs" />
     <Compile Include="SystemComponents\IWirelessNetwork.cs" />
     <Compile Include="SystemComponents\WirelessNetworkStatus.cs" />
+    <Compile Include="UserInterface\Browser\Events\ActionRequestedEventHandler.cs" />
+    <Compile Include="UserInterface\Browser\Events\AddressChangedEventHandler.cs" />
+    <Compile Include="UserInterface\Browser\Events\LoadingStateChangedEventHandler.cs" />
+    <Compile Include="UserInterface\Browser\Events\TitleChangedEventHandler.cs" />
     <Compile Include="UserInterface\Browser\IBrowserControl.cs" />
     <Compile Include="UserInterface\Browser\IBrowserWindow.cs" />
     <Compile Include="UserInterface\MessageBox\IMessageBox.cs" />
     <Compile Include="UserInterface\IProgressIndicator.cs" />
-    <Compile Include="UserInterface\Taskbar\QuitButtonClickedEventHandler.cs" />
+    <Compile Include="UserInterface\Taskbar\Events\ApplicationButtonClickedEventHandler.cs" />
+    <Compile Include="UserInterface\Taskbar\Events\KeyboardLayoutSelectedEventHandler.cs" />
+    <Compile Include="UserInterface\Taskbar\Events\NotificationButtonClickedEventHandler.cs" />
+    <Compile Include="UserInterface\Taskbar\Events\WindowClosingEventHandler.cs" />
+    <Compile Include="UserInterface\Taskbar\Events\WirelessNetworkSelectedEventHandler.cs" />
+    <Compile Include="UserInterface\Taskbar\Events\QuitButtonClickedEventHandler.cs" />
     <Compile Include="UserInterface\Windows\IPasswordDialog.cs" />
     <Compile Include="UserInterface\Windows\IPasswordDialogResult.cs" />
     <Compile Include="UserInterface\Windows\IRuntimeWindow.cs" />
@@ -163,6 +177,7 @@
     <Compile Include="UserInterface\Windows\IWindow.cs" />
     <Compile Include="UserInterface\MessageBox\MessageBoxAction.cs" />
     <Compile Include="UserInterface\MessageBox\MessageBoxIcon.cs" />
+    <Compile Include="WindowsApi\Events\ProcessTerminatedEventHandler.cs" />
     <Compile Include="WindowsApi\IBounds.cs" />
     <Compile Include="WindowsApi\IDesktop.cs" />
     <Compile Include="WindowsApi\INativeMethods.cs" />

SafeExamBrowser.Contracts/UserInterface/Browser/Events/ActionRequestedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.UserInterface.Browser.Events
+{
+	/// <summary>
+	/// Indicates that the user requested an action.
+	/// </summary>
+	public delegate void ActionRequestedEventHandler();
+}

SafeExamBrowser.Contracts/UserInterface/Browser/Events/AddressChangedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.UserInterface.Browser.Events
+{
+	/// <summary>
+	/// Indicates that the address has changed to the specified value.
+	/// </summary>
+	public delegate void AddressChangedEventHandler(string address);
+}

SafeExamBrowser.Contracts/UserInterface/Browser/Events/LoadingStateChangedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.UserInterface.Browser.Events
+{
+	/// <summary>
+	/// Indicates that the loading state of a <see cref="IBrowserControl"/> has changed, i.e. whether it's loading or not.
+	/// </summary>
+	public delegate void LoadingStateChangedEventHandler(bool isLoading);
+}

SafeExamBrowser.Contracts/UserInterface/Browser/Events/TitleChangedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.UserInterface.Browser.Events
+{
+	/// <summary>
+	/// Indicates that the title of a <see cref="IBrowserControl"/> has changed.
+	/// </summary>
+	public delegate void TitleChangedEventHandler(string title);
+}

SafeExamBrowser.Contracts/UserInterface/Browser/IBrowserControl.cs

@@ -6,12 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using SafeExamBrowser.Contracts.UserInterface.Browser.Events;
+
 namespace SafeExamBrowser.Contracts.UserInterface.Browser
 {
-	public delegate void AddressChangedEventHandler(string address);
-	public delegate void LoadingStateChangedEventHandler(bool isLoading);
-	public delegate void TitleChangedEventHandler(string title);
-
 	/// <summary>
 	/// Defines the functionality of a browser control (i.e. an instance of the browser resp. its user interface) and is normally embedded
 	/// within an <see cref="IBrowserWindow"/>.

SafeExamBrowser.Contracts/UserInterface/Browser/IBrowserWindow.cs

@@ -6,12 +6,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using SafeExamBrowser.Contracts.UserInterface.Browser.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 
 namespace SafeExamBrowser.Contracts.UserInterface.Browser
 {
-	public delegate void ActionRequestedEventHandler();
-
 	/// <summary>
 	/// Defines the functionality of a browser window, i.e. a window with an embedded browser instance (see <see cref="IBrowserControl"/>).
 	/// </summary>

SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/ApplicationButtonClickedEventHandler.cs

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+using System;
+
+namespace SafeExamBrowser.Contracts.UserInterface.Taskbar.Events
+{
+	/// <summary>
+	/// Indicates that an <see cref="IApplicationButton"/> has been clicked, optionally specifying the ID of the selected instance (if
+	/// multiple instances of the same application are running).
+	/// </summary>
+	public delegate void ApplicationButtonClickedEventHandler(Guid? instanceId = null);
+}

SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/KeyboardLayoutSelectedEventHandler.cs

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+using SafeExamBrowser.Contracts.SystemComponents;
+
+namespace SafeExamBrowser.Contracts.UserInterface.Taskbar.Events
+{
+	/// <summary>
+	/// Indicates that a particular <see cref="IKeyboardLayout"/> has been selected by the user.
+	/// </summary>
+	public delegate void KeyboardLayoutSelectedEventHandler(IKeyboardLayout layout);
+}

SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/NotificationButtonClickedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.UserInterface.Taskbar.Events
+{
+	/// <summary>
+	/// Indicates that the user clicked on a <see cref="INotificationButton"/> in the <see cref="ITaskbar"/>.
+	/// </summary>
+	public delegate void NotificationButtonClickedEventHandler();
+}

SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/QuitButtonClickedEventHandler.cs

@@ -8,7 +8,7 @@
 
 using System.ComponentModel;
 
-namespace SafeExamBrowser.Contracts.UserInterface.Taskbar
+namespace SafeExamBrowser.Contracts.UserInterface.Taskbar.Events
 {
 	/// <summary>
 	/// Event handler used to define the control flow when the <see cref="ITaskbar"/>'s quit button is clicked.

SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/WindowClosingEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.UserInterface.Taskbar.Events
+{
+	/// <summary>
+	/// Indicates that a window is about to be closed.
+	/// </summary>
+	public delegate void WindowClosingEventHandler();
+}

SafeExamBrowser.Contracts/UserInterface/Taskbar/Events/WirelessNetworkSelectedEventHandler.cs

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+using SafeExamBrowser.Contracts.SystemComponents;
+
+namespace SafeExamBrowser.Contracts.UserInterface.Taskbar.Events
+{
+	/// <summary>
+	/// Indicates that a particular <see cref="IWirelessNetwork"/> has been selected by the user.
+	/// </summary>
+	public delegate void WirelessNetworkSelectedEventHandler(IWirelessNetwork network);
+}

SafeExamBrowser.Contracts/UserInterface/Taskbar/IApplicationButton.cs

@@ -6,13 +6,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-using System;
-using SafeExamBrowser.Contracts.Configuration;
+using SafeExamBrowser.Contracts.Behaviour;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 
 namespace SafeExamBrowser.Contracts.UserInterface.Taskbar
 {
-	public delegate void ApplicationButtonClickedEventHandler(Guid? instanceId = null);
-
 	/// <summary>
 	/// The button of a (third-party) application which can be loaded into the <see cref="ITaskbar"/>.
 	/// </summary>

SafeExamBrowser.Contracts/UserInterface/Taskbar/INotificationButton.cs

@@ -6,10 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
+
 namespace SafeExamBrowser.Contracts.UserInterface.Taskbar
 {
-	public delegate void NotificationButtonClickedEventHandler();
-
 	/// <summary>
 	/// The button of a notification which can be loaded into the <see cref="ITaskbar"/>.
 	/// </summary>

SafeExamBrowser.Contracts/UserInterface/Taskbar/ISystemKeyboardLayoutControl.cs

@@ -7,11 +7,10 @@
  */
 
 using SafeExamBrowser.Contracts.SystemComponents;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 
 namespace SafeExamBrowser.Contracts.UserInterface.Taskbar
 {
-	public delegate void KeyboardLayoutSelectedEventHandler(IKeyboardLayout layout);
-
 	/// <summary>
 	/// The control of the keyboard layout system component.
 	/// </summary>

SafeExamBrowser.Contracts/UserInterface/Taskbar/ISystemWirelessNetworkControl.cs

@@ -8,11 +8,10 @@
 
 using System.Collections.Generic;
 using SafeExamBrowser.Contracts.SystemComponents;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 
 namespace SafeExamBrowser.Contracts.UserInterface.Taskbar
 {
-	public delegate void WirelessNetworkSelectedEventHandler(IWirelessNetwork network);
-
 	/// <summary>
 	/// The control of the wireless network system component.
 	/// </summary>

SafeExamBrowser.Contracts/UserInterface/Taskbar/ITaskbar.cs

@@ -6,6 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
+
 namespace SafeExamBrowser.Contracts.UserInterface.Taskbar
 {
 	/// <summary>

SafeExamBrowser.Contracts/UserInterface/Windows/IWindow.cs

@@ -6,10 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
+
 namespace SafeExamBrowser.Contracts.UserInterface.Windows
 {
-	public delegate void WindowClosingEventHandler();
-
 	/// <summary>
 	/// Defines the functionality of a window.
 	/// </summary>

SafeExamBrowser.Contracts/WindowsApi/Events/ProcessTerminatedEventHandler.cs

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+namespace SafeExamBrowser.Contracts.WindowsApi.Events
+{
+	/// <summary>
+	/// Indicates that a process has terminated with the specified exit code.
+	/// </summary>
+	public delegate void ProcessTerminatedEventHandler(int exitCode);
+}

SafeExamBrowser.Contracts/WindowsApi/IProcess.cs

@@ -6,10 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+using SafeExamBrowser.Contracts.WindowsApi.Events;
+
 namespace SafeExamBrowser.Contracts.WindowsApi
 {
-	public delegate void ProcessTerminatedEventHandler(int exitCode);
-
 	/// <summary>
 	/// Represents a process and defines its functionality.
 	/// </summary>

SafeExamBrowser.Monitoring/Display/DisplayMonitor.cs

@@ -11,6 +11,7 @@ using System.Windows.Forms;
 using Microsoft.Win32;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
+using SafeExamBrowser.Contracts.Monitoring.Events;
 using SafeExamBrowser.Contracts.WindowsApi;
 
 namespace SafeExamBrowser.Monitoring.Display

SafeExamBrowser.Monitoring/Processes/ProcessMonitor.cs

@@ -14,6 +14,7 @@ using System.Management;
 using System.Threading;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
+using SafeExamBrowser.Contracts.Monitoring.Events;
 using SafeExamBrowser.Contracts.WindowsApi;
 
 namespace SafeExamBrowser.Monitoring.Processes

SafeExamBrowser.Monitoring/Windows/WindowMonitor.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.Monitoring;
+using SafeExamBrowser.Contracts.Monitoring.Events;
 using SafeExamBrowser.Contracts.WindowsApi;
 
 namespace SafeExamBrowser.Monitoring.Windows

SafeExamBrowser.Runtime/Behaviour/Operations/ClientOperation.cs

@@ -16,6 +16,7 @@ using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.WindowsApi;
+using SafeExamBrowser.Contracts.WindowsApi.Events;
 
 namespace SafeExamBrowser.Runtime.Behaviour.Operations
 {

SafeExamBrowser.UserInterface.Classic/AboutWindow.xaml.cs

@@ -10,6 +10,7 @@ using System.Windows;
 using System.Windows.Documents;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 
 namespace SafeExamBrowser.UserInterface.Classic

SafeExamBrowser.UserInterface.Classic/BrowserWindow.xaml.cs

@@ -11,6 +11,8 @@ using System.Windows;
 using System.Windows.Input;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.UserInterface.Browser;
+using SafeExamBrowser.Contracts.UserInterface.Browser.Events;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 using SafeExamBrowser.UserInterface.Classic.Utilities;
 

SafeExamBrowser.UserInterface.Classic/Controls/ApplicationButton.xaml.cs

@@ -12,8 +12,10 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Classic.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Classic.Controls

SafeExamBrowser.UserInterface.Classic/Controls/ApplicationInstanceButton.xaml.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.UserInterface.Classic.Utilities;
 

SafeExamBrowser.UserInterface.Classic/Controls/KeyboardLayoutControl.xaml.cs

@@ -12,6 +12,7 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using SafeExamBrowser.Contracts.SystemComponents;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 
 namespace SafeExamBrowser.UserInterface.Classic.Controls
 {

SafeExamBrowser.UserInterface.Classic/Controls/NotificationButton.xaml.cs

@@ -10,6 +10,7 @@ using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Classic.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Classic.Controls

SafeExamBrowser.UserInterface.Classic/Controls/QuitButton.xaml.cs

@@ -10,7 +10,7 @@ using System;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Classic.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Classic.Controls

SafeExamBrowser.UserInterface.Classic/Controls/WirelessNetworkControl.xaml.cs

@@ -14,6 +14,7 @@ using System.Windows.Media;
 using FontAwesome.WPF;
 using SafeExamBrowser.Contracts.SystemComponents;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Classic.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Classic.Controls

SafeExamBrowser.UserInterface.Classic/LogWindow.xaml.cs

@@ -10,6 +10,7 @@ using System.ComponentModel;
 using System.Windows;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 using SafeExamBrowser.UserInterface.Classic.ViewModels;
 

SafeExamBrowser.UserInterface.Classic/PasswordDialog.xaml.cs

@@ -8,6 +8,7 @@
 
 using System.Windows;
 using SafeExamBrowser.Contracts.I18n;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 
 namespace SafeExamBrowser.UserInterface.Classic

SafeExamBrowser.UserInterface.Classic/RuntimeWindow.xaml.cs

@@ -12,6 +12,7 @@ using System.Windows.Documents;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 using SafeExamBrowser.UserInterface.Classic.ViewModels;
 

SafeExamBrowser.UserInterface.Classic/SplashScreen.xaml.cs

@@ -10,6 +10,7 @@ using System.Windows;
 using System.Windows.Documents;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 using SafeExamBrowser.UserInterface.Classic.ViewModels;
 

SafeExamBrowser.UserInterface.Classic/Taskbar.xaml.cs

@@ -10,6 +10,7 @@ using System.ComponentModel;
 using System.Windows;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Classic.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Classic

SafeExamBrowser.UserInterface.Windows10/AboutWindow.xaml.cs

@@ -10,6 +10,7 @@ using System.Windows;
 using System.Windows.Documents;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 
 namespace SafeExamBrowser.UserInterface.Windows10

SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationButton.xaml.cs

@@ -12,8 +12,10 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Windows10.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Windows10.Controls

SafeExamBrowser.UserInterface.Windows10/Controls/ApplicationInstanceButton.xaml.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using SafeExamBrowser.Contracts.Behaviour;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.UserInterface.Windows10.Utilities;
 

SafeExamBrowser.UserInterface.Windows10/Controls/NotificationButton.xaml.cs

@@ -10,6 +10,7 @@ using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Windows10.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Windows10.Controls

SafeExamBrowser.UserInterface.Windows10/Controls/QuitButton.xaml.cs

@@ -10,6 +10,7 @@ using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 
 namespace SafeExamBrowser.UserInterface.Windows10.Controls
 {

SafeExamBrowser.UserInterface.Windows10/LogWindow.xaml.cs

@@ -10,6 +10,7 @@ using System.ComponentModel;
 using System.Windows;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 using SafeExamBrowser.UserInterface.Windows10.ViewModels;
 

SafeExamBrowser.UserInterface.Windows10/SplashScreen.xaml.cs

@@ -10,6 +10,7 @@ using System.Windows;
 using System.Windows.Documents;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.I18n;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.Contracts.UserInterface.Windows;
 using SafeExamBrowser.UserInterface.Windows10.ViewModels;
 

SafeExamBrowser.UserInterface.Windows10/Taskbar.xaml.cs

@@ -10,6 +10,7 @@ using System.ComponentModel;
 using System.Windows;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
+using SafeExamBrowser.Contracts.UserInterface.Taskbar.Events;
 using SafeExamBrowser.UserInterface.Windows10.Utilities;
 
 namespace SafeExamBrowser.UserInterface.Windows10

SafeExamBrowser.WindowsApi/Process.cs

@@ -7,6 +7,7 @@
  */
 
 using SafeExamBrowser.Contracts.WindowsApi;
+using SafeExamBrowser.Contracts.WindowsApi.Events;
 
 namespace SafeExamBrowser.WindowsApi
 {