BASELINE: Update Chromium to 66.0.3359.156

Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

13 files changed, 99 insertions, 78 deletions

diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_config.html b/chromium/chrome/browser/resources/settings/internet_page/internet_config.html
index 4fa0a79d5e8..fce0c7e3d29 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_config.html
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_config.html
@@ -32,7 +32,7 @@
             share-allow-enable="[[shareAllowEnable_]]"
             share-default="[[shareDefault_]]"
             error="{{error_}}"
-            on-close="close">
+            on-close="onClose_">
         </network-config>
       </div>
 
@@ -40,17 +40,17 @@
         <template is="dom-if" if="[[error_]]" restamp>
           <div class="flex error">[[getError_(error_)]]</div>
         </template>
-        <paper-button class="cancel-button" on-tap="onCancelTap_">
+        <paper-button class="cancel-button" on-click="onCancelTap_">
           $i18n{cancel}
         </paper-button>
-        <template is="dom-if" if="[[isConfigured_(networkProperties_, guid)]]">
-          <paper-button class="action-button" on-tap="onSaveOrConnectTap_"
+        <template is="dom-if" if="[[!showConnect]]">
+          <paper-button class="action-button" on-click="onSaveTap_"
               disabled="[[!enableSave_]]">
             $i18n{save}
           </paper-button>
         </template>
-        <template is="dom-if" if="[[!isConfigured_(networkProperties_, guid)]]">
-          <paper-button class="action-button" on-tap="onSaveOrConnectTap_"
+        <template is="dom-if" if="[[showConnect]]">
+          <paper-button class="action-button" on-click="onConnectTap_"
               disabled="[[!enableConnect_]]">
             $i18n{networkButtonConnect}
           </paper-button>
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_config.js b/chromium/chrome/browser/resources/settings/internet_page/internet_config.js
index b6bda81171f..ba7c90de4ab 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_config.js
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_config.js
@@ -56,6 +56,12 @@ Polymer({
      */
     name: String,
 
+    /**
+     * Set to true to show the 'connect' button instead of 'save'.
+     * @private
+     */
+    showConnect: Boolean,
+
     /** @private */
     enableConnect_: Boolean,
 
@@ -103,6 +109,16 @@ Polymer({
   },
 
   /**
+   * @param {!Event} event
+   * @private
+   */
+  onClose_: function(event) {
+    this.close();
+    this.fire('networks-changed');
+    event.stopPropagation();
+  },
+
+  /**
    * @return {string}
    * @private
    */
@@ -124,22 +140,18 @@ Polymer({
     return this.i18n('networkErrorUnknown');
   },
 
-  /**
-   * @return {boolean}
-   * @private
-   */
-  isConfigured_: function() {
-    const source = this.networkProperties_.Source;
-    return !!this.guid && !!source && source != CrOnc.Source.NONE;
-  },
-
   /** @private */
   onCancelTap_: function() {
     this.close();
   },
 
   /** @private */
-  onSaveOrConnectTap_: function() {
-    this.$.networkConfig.saveOrConnect();
+  onSaveTap_: function() {
+    this.$.networkConfig.save();
+  },
+
+  /** @private */
+  onConnectTap_: function() {
+    this.$.networkConfig.connect();
   },
 });
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html
index e3afc520289..cbee01f9b6e 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html
@@ -81,30 +81,30 @@
         </template>
       </div>
       <template is="dom-if" if="[[!isSecondaryUser_]]">
-        <paper-button on-tap="onForgetTap_"
+        <paper-button on-click="onForgetTap_"
             hidden$="[[!showForget_(networkProperties)]]">
           $i18n{networkButtonForget}
         </paper-button>
-        <paper-button on-tap="onViewAccountTap_"
+        <paper-button on-click="onViewAccountTap_"
             hidden$="[[!showViewAccount_(networkProperties)]]">
           $i18n{networkButtonViewAccount}
         </paper-button>
-        <paper-button on-tap="onActivateTap_"
+        <paper-button on-click="onActivateTap_"
             hidden$="[[!showActivate_(networkProperties)]]">
           $i18n{networkButtonActivate}
         </paper-button>
-        <paper-button on-tap="onConfigureTap_"
+        <paper-button on-click="onConfigureTap_"
             hidden$="[[!showConfigure_(networkProperties, globalPolicy)]]">
           $i18n{networkButtonConfigure}
         </paper-button>
       </template>
-      <paper-button class="primary-button" on-tap="onConnectTap_"
+      <paper-button class="primary-button" on-click="onConnectTap_"
           hidden$="[[!showConnect_(networkProperties, globalPolicy)]]"
           disabled="[[!enableConnect_(networkProperties, defaultNetwork,
               globalPolicy, networkPropertiesReceived_, outOfRange_)]]">
         $i18n{networkButtonConnect}
       </paper-button>
-      <paper-button class="primary-button" on-tap="onDisconnectTap_"
+      <paper-button class="primary-button" on-click="onDisconnectTap_"
           hidden$="[[!showDisconnect_(networkProperties)]]">
         $i18n{networkButtonDisconnect}
       </paper-button>
@@ -203,7 +203,7 @@
 
       <template is="dom-if" if="[[showAdvanced_(networkProperties)]]">
         <!-- Advanced toggle. -->
-        <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_">
+        <div class="settings-box" actionable on-click="toggleAdvancedExpanded_">
           <div class="flex">$i18n{networkSectionAdvanced}</div>
           <cr-expand-button expanded="{{advancedExpanded_}}"
               alt="$i18n{networkSectionAdvancedA11yLabel}">
@@ -232,7 +232,7 @@
 
       <template is="dom-if" if="[[hasNetworkSection_(networkProperties)]]">
         <!-- Network toggle -->
-        <div class="settings-box" actionable on-tap="toggleNetworkExpanded_">
+        <div class="settings-box" actionable on-click="toggleNetworkExpanded_">
           <div class="start">$i18n{networkSectionNetwork}</div>
           <cr-expand-button expanded="{{networkExpanded_}}"
               alt="$i18n{networkSectionNetworkExpandA11yLabel}">
@@ -274,7 +274,7 @@
 
       <template is="dom-if" if="[[hasProxySection_(networkProperties)]]">
         <!-- Proxy toggle -->
-        <div class="settings-box" actionable on-tap="toggleProxyExpanded_">
+        <div class="settings-box" actionable on-click="toggleProxyExpanded_">
           <div class="start">$i18n{networkSectionProxy}</div>
           <cr-expand-button expanded="{{proxyExpanded_}}"
               alt="$i18n{networkSectionProxyExpandA11yLabel}">
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.js b/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.js
index b8c3480ddcd..c21b36319f5 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.js
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.js
@@ -630,7 +630,6 @@ Polymer({
       this.showTetherDialog_();
       return;
     }
-
     this.fire('network-connect', {networkProperties: this.networkProperties});
   },
 
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.html b/chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.html
index 6d2f1357614..4466b23e664 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.html
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_known_networks_page.html
@@ -36,12 +36,12 @@
             </cr-policy-indicator>
           </template>
           <button class="subpage-arrow" is="paper-icon-button-light"
-              actionable on-tap="fireShowDetails_" tabindex$="[[tabindex]]"
+              actionable on-click="fireShowDetails_" tabindex$="[[tabindex]]"
               aria-label$="[[item.Name]]">
           </button>
           <div class="separator"></div>
           <button is="paper-icon-button-light" class="icon-more-vert"
-              preferred tabindex$="[[tabindex]]" on-tap="onMenuButtonTap_"
+              preferred tabindex$="[[tabindex]]" on-click="onMenuButtonTap_"
               title="$i18n{moreActions}">
           </button>
         </div>
@@ -63,12 +63,12 @@
             </cr-policy-indicator>
           </template>
           <button class="subpage-arrow" is="paper-icon-button-light"
-              actionable on-tap="fireShowDetails_" tabindex$="[[tabindex]]"
+              actionable on-click="fireShowDetails_" tabindex$="[[tabindex]]"
               aria-label$="[[item.Name]]">
           </button>
           <div class="separator"></div>
           <button is="paper-icon-button-light" class="icon-more-vert"
-              tabindex$="[[tabindex]]" on-tap="onMenuButtonTap_"
+              tabindex$="[[tabindex]]" on-click="onMenuButtonTap_"
               title="$i18n{moreActions}">
           </button>
         </div>
@@ -76,16 +76,16 @@
     </div>
 
     <dialog id="dotsMenu" is="cr-action-menu">
-      <button class="dropdown-item" hidden="[[!showAddPreferred_]]"
-          on-tap="onAddPreferredTap_">
+      <button slot="item" class="dropdown-item" hidden="[[!showAddPreferred_]]"
+          on-click="onAddPreferredTap_">
         $i18n{knownNetworksMenuAddPreferred}
       </button>
-      <button class="dropdown-item" hidden="[[!showRemovePreferred_]]"
-          on-tap="onRemovePreferredTap_">
+      <button slot="item" class="dropdown-item"
+          hidden="[[!showRemovePreferred_]]" on-click="onRemovePreferredTap_">
         $i18n{knownNetworksMenuRemovePreferred}
       </button>
-      <button class="dropdown-item" disabled="[[!enableForget_]]"
-          on-tap="onForgetTap_">
+      <button slot="item" class="dropdown-item" disabled="[[!enableForget_]]"
+          on-click="onForgetTap_">
         $i18n{knownNetworksMenuForget}
       </button>
     </dialog>
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_page.html b/chromium/chrome/browser/resources/settings/internet_page/internet_page.html
index cd6b2afbadb..0c7cf9c5c72 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_page.html
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_page.html
@@ -38,7 +38,7 @@
         </network-summary>
         <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]">
           <div actionable class="settings-box two-line"
-              on-tap="onExpandAddConnectionsTap_">
+              on-click="onExpandAddConnectionsTap_">
             <div class="start layout horizontal center">
               <div>$i18n{internetAddConnection}</div>
             </div>
@@ -50,7 +50,7 @@
             <div class="list-frame vertical-list">
               <template is="dom-if"
                   if="[[deviceIsEnabled_(deviceStates.WiFi)]]">
-                <div actionable class="list-item" on-tap="onAddWiFiTap_">
+                <div actionable class="list-item" on-click="onAddWiFiTap_">
                   <div class="start">$i18n{internetAddWiFi}</div>
                   <button class$="[[getAddNetworkClass_('WiFi')]]"
                       is="paper-icon-button-light"
@@ -58,7 +58,7 @@
                   </button>
                 </div>
               </template>
-              <div actionable class="list-item" on-tap="onAddVPNTap_">
+              <div actionable class="list-item" on-click="onAddVPNTap_">
                 <div class="start">$i18n{internetAddVPN}</div>
                 <button class$="[[getAddNetworkClass_('VPN')]]"
                     is="paper-icon-button-light"
@@ -67,7 +67,7 @@
               </div>
               <template is="dom-repeat" items="[[thirdPartyVpnProviders_]]">
                 <div actionable class="list-item"
-                    on-tap="onAddThirdPartyVpnTap_" provider="[[item]]">
+                    on-click="onAddThirdPartyVpnTap_" provider="[[item]]">
                   <div class="start">[[getAddThirdPartyVpnLabel_(item)]]</div>
                   <button class="icon-external" is="paper-icon-button-light"
                       aria-label$="[[getAddThirdPartyVpnLabel_(item)]]">
@@ -76,7 +76,7 @@
               </template>
               <template is="dom-if" if="[[arcVpnProviders_.length]]">
                 <div actionable class="list-item" id="addArcVpn"
-                    on-tap="onAddArcVpnTap_">
+                    on-click="onAddArcVpnTap_">
                   <div class="start">$i18n{internetAddArcVPN}</div>
                   <button class="icon-external" is="paper-icon-button-light"
                       aria-label$="$i18n{internetAddArcVPN}">
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_page.js b/chromium/chrome/browser/resources/settings/internet_page/internet_page.js
index 3b8126607c7..ed1eda816ef 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_page.js
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_page.js
@@ -272,27 +272,27 @@ Polymer({
    */
   onShowConfig_: function(event) {
     const properties = event.detail;
+    let configAndConnect = !properties.GUID;  // New configuration
     this.showConfig_(
-        properties.Type, properties.GUID, CrOnc.getNetworkName(properties));
+        configAndConnect, properties.Type, properties.GUID,
+        CrOnc.getNetworkName(properties));
   },
 
   /**
+   * @param {boolean} configAndConnect
    * @param {string} type
    * @param {string=} guid
    * @param {string=} name
    * @private
    */
-  showConfig_: function(type, guid, name) {
-    if (!loadTimeData.getBoolean('networkSettingsConfig')) {
-      chrome.send('configureNetwork', [guid]);
-      return;
-    }
+  showConfig_: function(configAndConnect, type, guid, name) {
     const configDialog =
         /** @type {!InternetConfigElement} */ (this.$.configDialog);
     configDialog.type =
         /** @type {chrome.networkingPrivate.NetworkType} */ (type);
     configDialog.guid = guid || '';
     configDialog.name = name || '';
+    configDialog.showConnect = configAndConnect;
     configDialog.open();
   },
 
@@ -369,7 +369,7 @@ Polymer({
   },
 
   /**
-   * Event triggered when the 'Add connections' div is tapped.
+   * Event triggered when the 'Add connections' div is clicked.
    * @param {!Event} event
    * @private
    */
@@ -382,7 +382,7 @@ Polymer({
   /** @private */
   onAddWiFiTap_: function() {
     if (loadTimeData.getBoolean('networkSettingsConfig'))
-      this.showConfig_(CrOnc.Type.WI_FI);
+      this.showConfig_(true /* configAndConnect */, CrOnc.Type.WI_FI);
     else
       chrome.send('addNetwork', [CrOnc.Type.WI_FI]);
   },
@@ -390,7 +390,7 @@ Polymer({
   /** @private */
   onAddVPNTap_: function() {
     if (loadTimeData.getBoolean('networkSettingsConfig'))
-      this.showConfig_(CrOnc.Type.VPN);
+      this.showConfig_(true /* configAndConnect */, CrOnc.Type.VPN);
     else
       chrome.send('addNetwork', [CrOnc.Type.VPN]);
   },
@@ -604,7 +604,8 @@ Polymer({
     }
 
     if (properties.Connectable === false || properties.ErrorState) {
-      this.showConfig_(properties.Type, properties.GUID, name);
+      this.showConfig_(
+          true /* configAndConnect */, properties.Type, properties.GUID, name);
       return;
     }
 
@@ -618,7 +619,9 @@ Polymer({
         console.error(
             'networkingPrivate.startConnect error: ' + message +
             ' For: ' + properties.GUID);
-        this.showConfig_(properties.Type, properties.GUID, name);
+        this.showConfig_(
+            true /* configAndConnect */, properties.Type, properties.GUID,
+            name);
       }
     });
   },
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_subpage.html b/chromium/chrome/browser/resources/settings/internet_page/internet_subpage.html
index 3119ac4ec1c..ad9e3d48712 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_subpage.html
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_subpage.html
@@ -65,12 +65,12 @@
       }
 
       #gmscore-notifications-device-string {
-        @apply(--cr-secondary-text);
+        @apply --cr-secondary-text;
         margin-top: 5px;
       }
 
       #gmscore-notifications-instructions {
-        @apply(--cr-secondary-text);
+        @apply --cr-secondary-text;
         -webkit-padding-start: 15px;
         margin: 0;
       }
@@ -86,19 +86,19 @@
         <button is="paper-icon-button-light" id="addButton"
             hidden$="[[!showAddButton_(deviceState, globalPolicy)]]"
             aria-label="$i18n{internetAddWiFi}" class="icon-add-wifi"
-            on-tap="onAddButtonTap_" tabindex$="[[tabindex]]">
+            on-click="onAddButtonTap_" tabindex$="[[tabindex]]">
         </button>
         <paper-toggle-button id="deviceEnabledButton"
             aria-label$="[[getToggleA11yString_(deviceState)]]"
             checked="[[deviceIsEnabled_(deviceState)]]"
             disabled="[[!enableToggleIsEnabled_(deviceState)]]"
-            on-tap="onDeviceEnabledTap_">
+            on-click="onDeviceEnabledTap_">
         </paper-toggle-button>
       </div>
     </template>
 
     <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]">
-      <div actionable class="settings-box" on-tap="onKnownNetworksTap_">
+      <div actionable class="settings-box" on-click="onKnownNetworksTap_">
         <div class="start">$i18n{knownNetworksButton}</div>
         <button class="subpage-arrow" is="paper-icon-button-light"
             aria-label="$i18n{knownNetworksButton}">
@@ -114,7 +114,7 @@
             <div class="flex">$i18n{networkVpnBuiltin}</div>
             <button is="paper-icon-button-light" class="icon-add-circle"
                 aria-label="$i18n{internetAddVPN}"
-                on-tap="onAddButtonTap_" tabindex$="[[tabindex]]">
+                on-click="onAddButtonTap_" tabindex$="[[tabindex]]">
             </button>
           </div>
         </template>
@@ -143,6 +143,7 @@
               <li>$i18n{gmscoreNotificationsFirstStep}</li>
               <li>$i18n{gmscoreNotificationsSecondStep}</li>
               <li>$i18n{gmscoreNotificationsThirdStep}</li>
+              <li>$i18n{gmscoreNotificationsFourthStep}</li>
             </ol>
           </div>
         </template>
@@ -165,7 +166,7 @@
               <div class="flex">[[item.ProviderName]]</div>
               <button is="paper-icon-button-light" class="icon-add-circle"
                   aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]"
-                  on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]">
+                  on-click="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]">
               </button>
             </div>
             <cr-network-list show-buttons
@@ -185,7 +186,7 @@
               <div class="flex">[[item.ProviderName]]</div>
               <button is="paper-icon-button-light" class="icon-add-circle"
                   aria-label$="[[getAddArcVpnAllyString_(item)]]"
-                  on-tap="onAddArcVpnTap_" tabindex$="[[tabindex]]">
+                  on-click="onAddArcVpnTap_" tabindex$="[[tabindex]]">
               </button>
             </div>
             <cr-network-list show-buttons
@@ -204,7 +205,7 @@
       <template is="dom-if"
           if="[[tetherToggleIsVisible_(deviceState, tetherDeviceState)]]">
         <div class="settings-box two-line" actionable
-            on-tap="onTetherEnabledTap_">
+            on-click="onTetherEnabledTap_">
           <div class="start">
             $i18n{internetToggleTetherLabel}
             <div id="tetherSecondary" class="secondary">
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_subpage.js b/chromium/chrome/browser/resources/settings/internet_page/internet_subpage.js
index 2d1c08ee297..c45566055aa 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/internet_subpage.js
+++ b/chromium/chrome/browser/resources/settings/internet_page/internet_subpage.js
@@ -442,7 +442,7 @@ Polymer({
   },
 
   /**
-   * Event triggered when the known networks button is tapped.
+   * Event triggered when the known networks button is clicked.
    * @private
    */
   onKnownNetworksTap_: function() {
diff --git a/chromium/chrome/browser/resources/settings/internet_page/network_proxy_section.html b/chromium/chrome/browser/resources/settings/internet_page/network_proxy_section.html
index f5d88e89c41..7aa2e646067 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/network_proxy_section.html
+++ b/chromium/chrome/browser/resources/settings/internet_page/network_proxy_section.html
@@ -90,11 +90,11 @@
       </div>
       <div slot="button-container">
         <paper-button class="cancel-button"
-            on-tap="onAllowSharedDialogCancel_">
+            on-click="onAllowSharedDialogCancel_">
           $i18n{cancel}
         </paper-button>
         <paper-button class="action-button"
-            on-tap="onAllowSharedDialogConfirm_">
+            on-click="onAllowSharedDialogConfirm_">
           $i18n{confirm}
         </paper-button>
       </div>
diff --git a/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.html b/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.html
index 812bf51fff9..2df92961938 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.html
+++ b/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.html
@@ -34,7 +34,7 @@
         font-weight: 400;
       }
     </style>
-    <div actionable class="settings-box two-line" on-tap="onShowDetailsTap_">
+    <div actionable class="settings-box two-line" on-click="onShowDetailsTap_">
       <div id="details" no-flex$="[[showSimInfo_(deviceState)]]">
         <cr-network-icon network-state="[[activeNetworkState]]"
             device-state="[[deviceState]]">
@@ -48,7 +48,7 @@
       </div>
 
       <template is="dom-if" if="[[showSimInfo_(deviceState)]]" restamp>
-        <network-siminfo editable on-tap="doNothing_"
+        <network-siminfo editable on-click="doNothing_"
             network-properties="[[getCellularState_(deviceState)]]"
             networking-private="[[networkingPrivate]]">
         </network-siminfo>
@@ -57,7 +57,7 @@
       <template is="dom-if" if="[[showPolicyIndicator_(activeNetworkState)]]">
         <cr-policy-indicator indicator-type="[[getIndicatorTypeForSource(
             activeNetworkState.Source)]]"
-            on-tap="doNothing_">
+            on-click="doNothing_">
         </cr-policy-indicator>
       </template>
 
@@ -75,7 +75,7 @@
             aria-label$="[[getToggleA11yString_(deviceState)]]"
             checked="[[deviceIsEnabled_(deviceState)]]"
             disabled="[[!enableToggleIsEnabled_(deviceState)]]"
-            on-tap="onDeviceEnabledTap_">
+            on-click="onDeviceEnabledTap_">
         </paper-toggle-button>
       </template>
     </div>
diff --git a/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.js b/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.js
index 65c882d595d..e7a54cb245a 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.js
+++ b/chromium/chrome/browser/resources/settings/internet_page/network_summary_item.js
@@ -68,10 +68,9 @@ Polymer({
    * @private
    */
   getNetworkStateText_: function(activeNetworkState, deviceState) {
-    const state = activeNetworkState.ConnectionState;
-    const name = CrOnc.getNetworkName(activeNetworkState);
-    if (state)
-      return this.getConnectionStateText_(state, name);
+    const stateText = this.getConnectionStateText_(activeNetworkState);
+    if (stateText)
+      return stateText;
     // No network state, use device state.
     if (deviceState) {
       // Type specific scanning or initialization states.
@@ -98,12 +97,15 @@ Polymer({
   },
 
   /**
-   * @param {CrOnc.ConnectionState} state
-   * @param {string} name
+   * @param {!CrOnc.NetworkStateProperties} networkState
    * @return {string}
    * @private
    */
-  getConnectionStateText_: function(state, name) {
+  getConnectionStateText_: function(networkState) {
+    const state = networkState.ConnectionState;
+    if (!state)
+      return '';
+    const name = CrOnc.getNetworkName(networkState);
     switch (state) {
       case CrOnc.ConnectionState.CONNECTED:
         return name;
@@ -112,6 +114,10 @@ Polymer({
           return CrOncStrings.networkListItemConnectingTo.replace('$1', name);
         return CrOncStrings.networkListItemConnecting;
       case CrOnc.ConnectionState.NOT_CONNECTED:
+        if (networkState.Type == CrOnc.Type.CELLULAR && networkState.Cellular &&
+            networkState.Cellular.Scanning) {
+          return this.i18n('internetMobileSearching');
+        }
         return CrOncStrings.networkListItemNotConnected;
     }
     assertNotReached();
diff --git a/chromium/chrome/browser/resources/settings/internet_page/tether_connection_dialog.html b/chromium/chrome/browser/resources/settings/internet_page/tether_connection_dialog.html
index 51e02e88fb0..c54c5c1186a 100644
--- a/chromium/chrome/browser/resources/settings/internet_page/tether_connection_dialog.html
+++ b/chromium/chrome/browser/resources/settings/internet_page/tether_connection_dialog.html
@@ -108,11 +108,11 @@
         </ul>
       </div>
       <div slot="button-container">
-        <paper-button class="cancel-button" on-tap="onNotNowTap_">
+        <paper-button class="cancel-button" on-click="onNotNowTap_">
           $i18n{tetherConnectionNotNowButton}
         </paper-button>
         <paper-button id="connectButton" class="action-button"
-            on-tap="onConnectTap_" disabled="[[outOfRange]]">
+            on-click="onConnectTap_" disabled="[[outOfRange]]">
           $i18n{tetherConnectionConnectButton}
         </paper-button>
       </div>