Fixed compiler error with DialogWindow

xbuild cannot compile function overload properly when the functions
have optional parameter.
Change remove the 1 option and 2 options variation and makes option1
and option2 optional.

Change-Id: If68dc2783488847937ea030f8189f09f0446a708

Author: chkuang-g

source/VersionHandlerImpl/src/DialogWindow.cs

@@ -121,7 +121,7 @@ private class DialogContext {
     /// is created and before it is displayed.</param>
     public delegate void DisplayDelegate(
         string title, string message, Option defaultOption,
-        string option0, string option1, string option2,
+        string option0, string option1 = null, string option2 = null,
         float windowWidth = DEFAULT_WINDOWS_WIDTH, Option windowCloseOption = Option.SelectedNone,
         Action<Option> complete = null,
         Action<DialogWindow> renderContent = null,
@@ -257,7 +257,7 @@ internal static void DisplayDefault(string title, string message, Option default
     /// <param name="init">(Optional) Callback for additional initialization after the dialog
     /// is created and before it is displayed.</param>
     public static void Display(string title, string message, Option defaultOption,
-            string option0, string option1, string option2,
+            string option0, string option1 = null, string option2 = null,
             float windowWidth = DEFAULT_WINDOWS_WIDTH,
             Option windowCloseOption = Option.SelectedNone,
             Action<Option> complete = null, Action<DialogWindow> renderContent = null,
@@ -266,60 +266,6 @@ public static void Display(string title, string message, Option defaultOption,
                 windowCloseOption, complete, renderContent, renderButtons, init);
     }
 
-    /// <summary>
-    /// Displays a non-blocking modal dialog with up to 2 options.
-    /// </summary>
-    /// <param name="title">Title of the dialog.</param>
-    /// <param name="message">Message to display in the dialog.</param>
-    /// <param name="defaultOption">Option selected if interactivity is disabled.</param>
-    /// <param name="option0">Text for the first option.</param>
-    /// <param name="option1">Text for the second option or null to disable.</param>
-    /// <param name="windowWidth">(Optional) Width of the dialog window.</param>
-    /// <param name="windowCloseOption">(Optional) Option selected if the dialog is closed.</param>
-    /// <param name="complete">(Optional) Callback to trigger once a selection is made.</param>
-    /// <param name="renderContent">(Optional) Callback to render additional content after
-    /// dialog message.</param>
-    /// <param name="renderButtons">(Optional) Callback to render additional content before option
-    /// buttons in the same row.</param>
-    /// <param name="init">(Optional) Callback for additional initialization after the dialog
-    /// is created and before it is displayed.</param>
-    public static void Display(string title, string message, Option defaultOption,
-            string option0, string option1,
-            float windowWidth = DEFAULT_WINDOWS_WIDTH,
-            Option windowCloseOption = Option.SelectedNone,
-            Action<Option> complete = null, Action<DialogWindow> renderContent = null,
-            Action<DialogWindow> renderButtons = null, Action<DialogWindow> init = null) {
-        displayDialogMethod(title, message, defaultOption, option0, option1, null, windowWidth,
-                windowCloseOption, complete, renderContent, renderButtons, init);
-    }
-
-    /// <summary>
-    /// Displays a non-blocking modal dialog with up to 1 options.
-    /// </summary>
-    /// <param name="title">Title of the dialog.</param>
-    /// <param name="message">Message to display in the dialog.</param>
-    /// <param name="defaultOption">Option selected if interactivity is disabled.</param>
-    /// <param name="option0">Text for the first option.</param>
-    /// <param name="option1">Text for the second option or null to disable.</param>
-    /// <param name="windowWidth">(Optional) Width of the dialog window.</param>
-    /// <param name="windowCloseOption">(Optional) Option selected if the dialog is closed.</param>
-    /// <param name="complete">(Optional) Callback to trigger once a selection is made.</param>
-    /// <param name="renderContent">(Optional) Callback to render additional content after
-    /// dialog message.</param>
-    /// <param name="renderButtons">(Optional) Callback to render additional content before option
-    /// buttons in the same row.</param>
-    /// <param name="init">(Optional) Callback for additional initialization after the dialog
-    /// is created and before it is displayed.</param>
-    public static void Display(string title, string message, Option defaultOption,
-            string option0,
-            float windowWidth = DEFAULT_WINDOWS_WIDTH,
-            Option windowCloseOption = Option.SelectedNone,
-            Action<Option> complete = null, Action<DialogWindow> renderContent = null,
-            Action<DialogWindow> renderButtons = null, Action<DialogWindow> init = null) {
-        displayDialogMethod(title, message, defaultOption, option0, null, null, windowWidth,
-                windowCloseOption, complete, renderContent, renderButtons, init);
-    }
-
     /// <summary>
     /// Render the dialog according to the context.
     /// </summary>

source/VersionHandlerImpl/src/EditorMeasurement.cs

@@ -362,7 +362,7 @@ public void PromptToEnable(Action complete) {
             displayDialog(
                 String.Format(EnableAnalytics, PluginName),
                 String.Format(RequestConsentMessage, PluginName),
-                DialogWindow.Option.Selected1, Yes, No, "",
+                DialogWindow.Option.Selected1, Yes, No,
                 windowWidth: 500.0f,
                 complete: option => {
                     switch (option) {

source/VersionHandlerImpl/unit_tests/src/EditorMeasurementTest.cs

@@ -136,7 +136,7 @@ private EditorMeasurement CreateEditorMeasurement() {
                                                   SETTINGS_NAMESPACE, PLUGIN_NAME,
                                                   DATA_COLLECTION_DESCRIPTION, PRIVACY_POLICY);
             analytics.displayDialog = (title, message, defaultOption, option0, option1,
-                                       option2, windowWidth, windowCloseOption,
+                                       windowWidth, windowCloseOption,
                                        complete, renderContent, renderButtons, init) => {
                 throw new Exception("Unexpected dialog displayed");
             };
@@ -184,10 +184,10 @@ public void Construct() {
         /// </summary>
         /// <param name="selectedOption">0..2</param>
         /// <returns>Display dialog delegate.</returns>
-        private DialogWindow.DisplayDelegate CreateDisplayDialogDelegate(
+        private DialogWindow.Display2OptionsDelegate CreateDisplayDialogDelegate(
                 List<DialogWindow.Option> selectedOptions) {
             return (string title, string message, DialogWindow.Option defaultOption,
-                    string option0, string option1, string option2,
+                    string option0, string option1,
                     float windowWidth, DialogWindow.Option windowCloseOption,
                     Action<DialogWindow.Option> complete,
                     Action<DialogWindow> renderContent,
@@ -198,7 +198,6 @@ private DialogWindow.DisplayDelegate CreateDisplayDialogDelegate(
                 Assert.That(defaultOption, Is.EqualTo(DialogWindow.Option.Selected0));
                 Assert.That(option0, Is.Not.Empty);
                 Assert.That(option1, Is.Not.Empty);
-                Assert.That(option2, Is.Empty);
                 Assert.That(windowCloseOption, Is.EqualTo(DialogWindow.Option.Selected0));
                 Assert.That(complete, Is.Not.Null);
                 Assert.That(renderContent, Is.Not.Null);