Combine AddToHomescreenDialog.Delegate#{onDialogCancelled(),onDialogDismised()}.

This CL addresses an inconsistency in behaviour between explicitly
tapping "Cancel" in the add to home screen dialog and tapping outside
the dialog to dismiss it (also effectively cancelling).

Explicitly tapping on "Cancel" allowed the site to receive a new
beforeinstallpromptevent to trigger a new dialog, but tapping outside
the dialog did not. This CL removes the inconsistency by eliminating the
AddToHomescreenDialog.Delegate#onDialogCancelled() method (previously
only called when explicitly tapping "Cancel"), and maintaining state in
the AppBannerUiDelegateAndroid to determine whether or not to call
AppBannerUiDelegateAndroid#nativeOnUiCancelled(). This ensures a fresh
beforeinstallpromptevent is dispatched when the dialog isn't accepted -
whether it was explicitly cancelled or implicitly dismissed by tapping
elsewhere on the screen.

BUG=867465

Change-Id: I4e37d4a34e2b25797ee5bc386010de0b995e3d93
Reviewed-on: https://chromium-review.googlesource.com/1157945
Commit-Queue: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580685}

chrome/android/java/src/org/chromium/chrome/browser/banners/AppBannerUiDelegateAndroid.java

@@ -31,6 +31,8 @@ public class AppBannerUiDelegateAndroid
 
     private AddToHomescreenDialog mDialog;
 
+    private boolean mAddedToHomescreen;
+
     private AppBannerUiDelegateAndroid(long nativePtr, Tab tab) {
         mNativePointer = nativePtr;
         mTab = tab;
@@ -38,15 +40,11 @@ public class AppBannerUiDelegateAndroid
 
     @Override
     public void addToHomescreen(String title) {
+        mAddedToHomescreen = true;
         // The title is ignored for app banners as we respect the developer-provided title.
         nativeAddToHomescreen(mNativePointer);
     }
 
-    @Override
-    public void onDialogCancelled() {
-        nativeOnUiCancelled(mNativePointer);
-    }
-
     @Override
     public void onNativeAppDetailsRequested() {
         nativeShowNativeAppDetails(mNativePointer);
@@ -54,8 +52,13 @@ public class AppBannerUiDelegateAndroid
 
     @Override
     public void onDialogDismissed() {
+        if (!mAddedToHomescreen) {
+            nativeOnUiCancelled(mNativePointer);
+        }
+
         mDialog = null;
         mInstallerDelegate = null;
+        mAddedToHomescreen = false;
     }
 
     @Override
@@ -91,6 +94,7 @@ public class AppBannerUiDelegateAndroid
         }
         mInstallerDelegate = null;
         mNativePointer = 0;
+        mAddedToHomescreen = false;
     }
 
     @CalledByNative

chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialog.java

@@ -42,11 +42,6 @@ public class AddToHomescreenDialog implements View.OnClickListener {
          */
         void addToHomescreen(String title);
 
-        /**
-         * Called when the dialog is explicitly cancelled by the user.
-         */
-        void onDialogCancelled();
-
         /**
          * Called when the user wants to view a native app in the Play Store.
          */
@@ -101,7 +96,6 @@ public class AddToHomescreenDialog implements View.OnClickListener {
                         .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int id) {
-                                mDelegate.onDialogCancelled();
                                 dialog.cancel();
                             }
                         });

chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenManager.java

@@ -62,11 +62,6 @@ public class AddToHomescreenManager implements AddToHomescreenDialog.Delegate {
         nativeAddToHomescreen(mNativeAddToHomescreenManager, userRequestedTitle);
     }
 
-    @Override
-    public void onDialogCancelled() {
-        // Do nothing.
-    }
-
     @Override
     public void onNativeAppDetailsRequested() {
         // This should never be called.