Fix favorite and auto_connect property usage.

BUG=chromium-os:8913
TEST=manually open chrome://settings/internet and see if remembered networks are listed properly.  For DOMUI network menu, pass --enable-domui-menu for chrome to enable and check.

Review URL: http://codereview.chromium.org/4818002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66253 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 29 insertions, 29 deletions

diff --git a/chrome/browser/resources/network_menu.js b/chrome/browser/resources/network_menu.js
index 8413e99..19f40a6 100644
--- a/chrome/browser/resources/network_menu.js
+++ b/chrome/browser/resources/network_menu.js
@@ -31,13 +31,13 @@ const NetworkOther = 'other';
 /**
  * Sends "connect" using the 'action' DOMUI message.
  */
-function sendConnect(index, passphrase, identity, remember) {
+function sendConnect(index, passphrase, identity, auto_connect) {
   chrome.send('action',
       ['connect',
        String(index),
        passphrase,
        identity,
-       remember ? '1' : '0']);
+       auto_connect ? '1' : '0']);
 }
 
 var networkMenuItemProto = (function() {
@@ -62,7 +62,7 @@ NetworkMenuItem.prototype = {
 
   ssidEdit: null,
   passwordEdit: null,
-  rememberCheckbox: null,
+  autoConnectCheckbox: null,
 
   /**
    * The label element.
@@ -135,19 +135,18 @@ NetworkMenuItem.prototype = {
         sendConnect(index,
             this.passwordEdit.value,
             this.ssidEdit.value,
-            this.rememberCheckbox.checked);
+            this.autoConnectCheckbox.checked);
       }
     } else if (this.passwordEdit) {
       if (this.passwordEdit.value) {
         sendConnect(index,
-            this.passwordEdit.value, '', this.rememberCheckbox.checked);
+            this.passwordEdit.value, '', this.autoConnectCheckbox.checked);
       }
     } else {
       if (this.attrs.remembered) {
-        sendConnect(index, this.attrs.passphrase, '',
-                    this.rememberCheckbox.checked);
+        sendConnect(index, this.attrs.passphrase, '', this.attrs.auto_connect);
       } else {
-        sendConnect(index, '', '', this.rememberCheckbox.checked);
+        sendConnect(index, '', '', this.autoConnectCheckbox.checked);
       }
     }
   },
@@ -230,22 +229,23 @@ NetworkMenuItem.prototype = {
   },
 
   /**
-   * Add remember this network check box to action area.
+   * Add auto-connect this network check box to action area.
    * @private
    */
-  addRememberCheckbox_: function() {
-    this.rememberCheckbox = this.ownerDocument.createElement('input');
-    this.rememberCheckbox.type = 'checkbox';
-    this.rememberCheckbox.checked = this.attrs.remembered;
+  addAutoConnectCheckbox_: function() {
+    this.autoConnectCheckbox = this.ownerDocument.createElement('input');
+    this.autoConnectCheckbox.type = 'checkbox';
+    this.autoConnectCheckbox.checked = this.attrs.auto_connect;
 
-    var rememberSpan = this.ownerDocument.createElement('span');
-    rememberSpan.textContent = localStrings.getString('remeber_this_network');
+    var autoConnectSpan = this.ownerDocument.createElement('span');
+    autoConnectSpan.textContent =
+        localStrings.getString('auto_connect_this_network');
 
-    var rememberLabel = this.ownerDocument.createElement('label');
-    rememberLabel.appendChild(this.rememberCheckbox);
-    rememberLabel.appendChild(rememberSpan);
+    var autoConnectLabel = this.ownerDocument.createElement('label');
+    autoConnectLabel.appendChild(this.autoConnectCheckbox);
+    autoConnectLabel.appendChild(autoConnectSpan);
 
-    this.action_.appendChild(rememberLabel);
+    this.action_.appendChild(autoConnectLabel);
   },
 
   /**
@@ -266,7 +266,7 @@ NetworkMenuItem.prototype = {
     if (attrs.network_type == NetworkOther) {
       this.addSsidEdit_();
       this.addPasswordEdit_();
-      this.addRememberCheckbox_();
+      this.addAutoConnectCheckbox_();
     } else if (attrs.status && attrs.status != 'unknown') {
       if (attrs.status == StatusConnected) {
         this.setStatus_(attrs.ip_address);
@@ -293,7 +293,7 @@ NetworkMenuItem.prototype = {
         this.addPasswordEdit_();
       }
 
-      this.addRememberCheckbox_();
+      this.addAutoConnectCheckbox_();
     }
     //////// End NetworkMenuItem specifi code
 
@@ -346,10 +346,10 @@ NetworkMenu.prototype = {
   /** @inheritDoc */
   onClick_: function(event, item) {
     // If item is a NetworkMenuItem, it must have at least one of the following.
-    if (item.rememberCheckbox || item.ssidEdit || item.passwordEdit) {
+    if (item.autoConnectCheckbox || item.ssidEdit || item.passwordEdit) {
       // Ignore clicks other than on the NetworkMenuItem itself.
-      if (event.target == item.rememberCheckbox ||
-          event.target == item.rememberCheckbox.nextElementSibling ||
+      if (event.target == item.autoConnectCheckbox ||
+          event.target == item.autoConnectCheckbox.nextElementSibling ||
           event.target == item.ssidEdit ||
           event.target == item.passwordEdit) {
         return;
diff --git a/chrome/browser/resources/options/chromeos_internet_detail.html b/chrome/browser/resources/options/chromeos_internet_detail.html
index f5fe513..a6ddd4c 100644
--- a/chrome/browser/resources/options/chromeos_internet_detail.html
+++ b/chrome/browser/resources/options/chromeos_internet_detail.html
@@ -42,8 +42,8 @@
         <tr>
           <td colspan="2">
             <label class="checkbox">
-              <input id="rememberNetwork" type="checkbox">
-              <span i18n-content="inetRememberNetwork"></span>
+              <input id="autoConnectNetwork" type="checkbox">
+              <span i18n-content="inetAutoConnectNetwork"></span>
             </label>
           </td>
         </tr>
diff --git a/chrome/browser/resources/options/chromeos_internet_options.js b/chrome/browser/resources/options/chromeos_internet_options.js
index af9adcb..eafd72f 100644
--- a/chrome/browser/resources/options/chromeos_internet_options.js
+++ b/chrome/browser/resources/options/chromeos_internet_options.js
@@ -116,7 +116,7 @@ cr.define('options', function() {
     if (data.type == 2) {
       var newinfo = [];
       newinfo.push(data.servicePath);
-      newinfo.push($('rememberNetwork').checked ? "true" : "false");
+      newinfo.push($('autoConnectNetwork').checked ? "true" : "false");
       if (data.encrypted && data.certNeeded) {
         newinfo.push($('inetIdent').value);
         newinfo.push($('inetCert').value);
@@ -258,10 +258,10 @@ cr.define('options', function() {
       page.removeAttribute('cellular');
       page.removeAttribute('gsm');
       $('inetSsid').textContent = data.ssid;
-      $('rememberNetwork').checked = data.autoConnect;
+      $('autoConnectNetwork').checked = data.autoConnect;
       if (!AccountsOptions.currentUserIsOwner()) {
         // Disable this for guest non-Owners.
-        $('rememberNetwork').disabled = true;
+        $('autoConnectNetwork').disabled = true;
       }
       page.removeAttribute('password');
       page.removeAttribute('cert');