[Nearby] Update high visibility toggle to show dialog.

Show high visibility dialog when the high visibility button is toggled
from the Nearby share subpage. This keeps the behavior consistent
with when high visibility is toggled from the tray.

Bug: 1154830
Change-Id: I17f6015706bca6f6b7ae85904c768e91923211e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2590652
Commit-Queue: Gordon Seto <gordonseto@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837443}

chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.js

@@ -2,6 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+/**
+ * @type {!number}
+ * @private
+ */
+const DEFAULT_HIGH_VISIBILITY_TIMEOUT_S = 300;
+
 /**
  * @fileoverview
  * 'settings-nearby-share-subpage' is the settings subpage for managing the
@@ -83,9 +89,6 @@ Polymer({
     },
   },
 
-  /** @private {?nearbyShare.mojom.ReceiveManagerInterface} */
-  receiveManager_: null,
-
   /** @private {?nearbyShare.mojom.ReceiveObserverReceiver} */
   receiveObserver_: null,
 
@@ -103,7 +106,6 @@ Polymer({
           this.profileName_ = accounts[0].fullName;
           this.profileLabel_ = accounts[0].email;
         });
-    this.receiveManager_ = nearby_share.getReceiveManager();
     this.receiveObserver_ = nearby_share.observeReceiveManager(
         /** @type {!nearbyShare.mojom.ReceiveObserverInterface} */ (this));
   },
@@ -206,9 +208,7 @@ Polymer({
   /** @private */
   onInHighVisibilityToggledByUser_() {
     if (this.inHighVisibility_) {
-      this.receiveManager_.registerForegroundReceiveSurface();
-    } else {
-      this.receiveManager_.unregisterForegroundReceiveSurface();
+      this.showHighVisibilityPage_();
     }
   },
 
@@ -350,11 +350,7 @@ Polymer({
     }
 
     if (queryParams.has('receive')) {
-      // Get shutoffTimeoutInSeconds with a default of 5 minutes (300 seconds)
-      const shutoffTimeoutInSeconds = Number(queryParams.get('timeout')) || 300;
-      this.showReceiveDialog_ = true;
-      Polymer.dom.flush();
-      this.$$('#receiveDialog').showHighVisibilityPage(shutoffTimeoutInSeconds);
+      this.showHighVisibilityPage_(Number(queryParams.get('timeout')));
     }
 
     if (queryParams.has('confirm')) {
@@ -372,6 +368,18 @@ Polymer({
     this.attemptDeepLink();
   },
 
+  /**
+   * @param {number=} timeoutInSeconds
+   * @private
+   */
+  showHighVisibilityPage_(timeoutInSeconds) {
+    const shutoffTimeoutInSeconds =
+        timeoutInSeconds || DEFAULT_HIGH_VISIBILITY_TIMEOUT_S;
+    this.showReceiveDialog_ = true;
+    Polymer.dom.flush();
+    this.$$('#receiveDialog').showHighVisibilityPage(shutoffTimeoutInSeconds);
+  },
+
   /**
    * @param {string} profileName The user's full name.
    * @param {string} profileLabel The user's email.

chrome/test/data/webui/settings/chromeos/nearby_share_subpage_tests.js

@@ -219,8 +219,13 @@ suite('NearbyShare', function() {
     Polymer.dom.flush();
     assertTrue(fakeReceiveManager.getInHighVisibilityForTest());
 
-    subpage.$$('#highVisibilityToggle').click();
-    Polymer.dom.flush();
+    const dialog = subpage.$$('nearby-share-receive-dialog');
+    assertTrue(!!dialog);
+
+    const highVisibilityDialog = dialog.$$('nearby-share-high-visibility-page');
+    assertTrue(test_util.isVisible(highVisibilityDialog));
+
+    dialog.close_();
     assertFalse(fakeReceiveManager.getInHighVisibilityForTest());
   });