Fix favorite and auto_connect property usage.

chrome/browser/resources/network_menu.js

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 // Network status constants.
 const StatusConnected = 'connected';
 const StatusDisconnected = 'disconnected';
 const StatusConnecting = 'connecting';
 const StatusError = 'error';
@@ skipping 13 matching lines @@
   ctx.strokeStyle = '#4e73c7';
   ctx.beginPath();
   ctx.moveTo(lineWidth / 2, r - lineWidth / 2);
   ctx.arc(r, r, r - lineWidth / 2, Math.PI, Math.PI * 3 / 2);
   ctx.stroke();
 })();
 
 /**
  * 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() {
     var networkMenuItem = cr.doc.createElement('div');
     networkMenuItem.innerHTML = '<div class="network-menu-item">' +
           '<div class="network-label-icon">' +
             '<div class="network-label"></div>' +
             '<div class="network-icon hidden"></div>' +
           '</div>' +
           '<div class="network-status hidden"></div>' +
           '<div class="hidden"></div>' +
         '</div>';
     return networkMenuItem;
   })();
 
 var NetworkMenuItem = cr.ui.define(function() {
     return networkMenuItemProto.cloneNode(true);
   });
 
 NetworkMenuItem.prototype = {
   __proto__: MenuItem.prototype,
 
   ssidEdit: null,
   passwordEdit: null,
-  rememberCheckbox: null,
+  autoConnectCheckbox: null,
 
   /**
    * The label element.
    * @private
    */
   get label_() {
     return this.firstElementChild.firstElementChild.firstElementChild;
   },
 
   /**
@@ skipping 52 matching lines @@
    * Handle reconnect.
    * @private
    */
   handleConnect_ : function(e) {
     var index = this.menu_.getMenuItemIndexOf(this);
     if (this.ssidEdit && this.passwordEdit) {
       if (this.ssidEdit.value) {
         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) {
+      if (this.attrs.auto_connect) {

[Charlie Lee, 2010/11/15 19:42:52]

I think this logic here needs to be updated. We do want to use remembered here.
The logic is if the network is remembered, then we don't need to pass back the
password. Maybe we just pass the password all the time even if it is remembered?
How does the code handle this?

[kochi, 2010/11/16 05:47:24]

Good catch.
If the network is remembered, we do not show any input
boxes to prompt password etc.  So in this case we do not
have auto_connect checkbox anyway, so we just pass the password
and auto_connect attribute as is.

         sendConnect(index, this.attrs.passphrase, '',
-                    this.rememberCheckbox.checked);
+                    this.autoConnectCheckbox.checked);
       } else {
-        sendConnect(index, '', '', this.rememberCheckbox.checked);
+        sendConnect(index, '', '', this.autoConnectCheckbox.checked);
       }
     }
   },
 
   /**
    * Handle keydown event in ssid edit.
    * @private
    */
   handleSsidEditKeydown_: function(e) {
     if (e.target == this.ssidEdit &&
@@ skipping 62 matching lines @@
     this.passwordEdit.pattern = '^\\S+$';
     this.passwordEdit.addEventListener('keydown',
         this.handlePassEditKeydown_.bind(this));
 
     var box = this.ownerDocument.createElement('div');
     box.appendChild(this.passwordEdit);
     this.action_.appendChild(box);
   },
 
   /**
-   * 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);
   },
 
   /**
    * Internal method to initiailze the MenuItem.
    * @private
    */
   initMenuItem_: function() {
     // *TODO: eliminate code duplication with menu.js
     // MenuItem.prototype.initMenuItem_();
     var attrs = this.attrs;
     this.classList.add(attrs.type);
     this.menu_.addHandlers(this, this);
 
     //////// NetworkMenuItem specific code:
     // TODO: Handle specific types of network, connecting icon.
     this.label_.textContent = attrs.label;
 
     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);
       } else if (attrs.status == StatusConnecting) {
         this.setStatus_(attrs.message);
 
         this.icon_.classList.add('spinner');
         this.icon_.classList.remove('hidden');
       } else if (attrs.status == StatusError) {
         this.setStatus_(attrs.message);
         this.setIcon_('chrome://theme/IDR_WARNING');
 
         var button = this.ownerDocument.createElement('button');
         button.textContent = localStrings.getString('reconnect');
         button.addEventListener('click', this.handleConnect_.bind(this));
         var box = this.ownerDocument.createElement('div');
         box.appendChild(button);
         this.action_.appendChild(box);
 
         this.showAction_(true);
       }
 
       if (attrs.need_passphrase) {
         this.addPasswordEdit_();
       }
 
-      this.addRememberCheckbox_();
+      this.addAutoConnectCheckbox_();
     }
     //////// End NetworkMenuItem specifi code
 
     if (attrs.font) {
       this.label_.style.font = attrs.font;
 
       var base_font = attrs.font.replace(/bold/, '').replace(/italic/, '');
       this.status_.style.font = base_font;
       this.action_.style.font = base_font;
     }
@@ skipping 32 matching lines @@
     if (attrs.type == 'command') {
       return new NetworkMenuItem();
     } else {
       return new MenuItem();
     }
   },
 
   /** @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;
       }
     }
 
     Menu.prototype.onClick_.call(this, event, item);
   },
 };