Cookies tree js code touch up.

chrome/browser/resources/options/cookies_view.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.
 
 cr.define('options', function() {
 
   var OptionsPage = options.OptionsPage;
 
   /////////////////////////////////////////////////////////////////////////////
   // CookiesView class:
@@ skipping 14 matching lines @@
     __proto__: OptionsPage.prototype,
 
     initializePage: function() {
       OptionsPage.prototype.initializePage.call(this);
 
       var cookiesTree = $('cookiesTree');
 
       options.CookiesTree.decorate(cookiesTree);
       cookiesTree.addEventListener('change',
           this.handleCookieTreeChange_.bind(this));
-      cookiesTree.addEventListener('keydown', this.handleKeyDown_);
+      cookiesTree.addEventListener('keydown', this.handleKeyDown_.bind(this));
 
       $('cookiesSearchBox').addEventListener('keydown',
           this.handleQueryEditKeyDown_.bind(this));
 
       var self = this;
       $('clearCookieSearchButton').onclick = function(e) {
         $('cookiesSearchBox').value = '';
         self.searchCookie();
       }
 
       $('remove-cookie').onclick = function(e) {
-        var selected = cookiesTree.selectedItem;
-        chrome.send('removeCookie', [selected.pathId]);
+        self.removeSelectedCookie_();
       }
 
       $('remove-all-cookie').onclick = function(e) {
         chrome.send('removeAllCookies', []);
       }
 
       this.addEventListener('visibleChange', this.handleVisibleChange_);
 
       this.clearCookieInfo();
     },
@@ skipping 168 matching lines @@
      * @param {Event} e Property change event.
      */
     handleVisibleChange_: function(e) {
       if (!this.initalized_ && this.visible) {
         this.initalized_ = true;
         this.searchCookie();
       }
     },
 
     /**
+     * Remove currently selected cookie.
+     * @private
+     */
+    removeSelectedCookie_: function() {
+      var selected = cookiesTree.selectedItem;
+      if (selected)
+        chrome.send('removeCookie', [selected.pathId]);
+    },
+
+    /**
      * Handler for keydown event.
      * @private
      * @param {Event} e KeyDown event.
      */
     handleKeyDown_: function(e) {
       // If 'Remove' button is enabled and key is 'Delete' key on all platforms
       // or 'Backspace' on Mac.
       if (!$('remove-cookie').disabled &&
           (e.keyIdentifier == 'U+007F' ||
             (cr.isMac && e.keyIdentifier == 'U+0008'))) {
+        // No further key handling to avoid navigation triggered by 'Backspace'
+        // on Mac.

[arv (Not doing code reviews), 2010/12/13 20:57:29]

Then you can remove the stopPropagation.

[xiyuan, 2010/12/13 21:12:34]

Done.

         e.preventDefault();
         e.stopPropagation();
-        cr.dispatchSimpleEvent($('remove-cookie'), 'click');
+
+        this.removeSelectedCookie_();
       }
     }
   };
 
   // CookiesViewHandler callbacks.
   CookiesView.onTreeItemAdded = function(args) {
     $('cookiesTree').addByParentId(args[0], args[1], args[2]);
   };
 
   CookiesView.onTreeItemRemoved = function(args) {
     $('cookiesTree').removeByParentId(args[0], args[1], args[2]);
   };
 
   CookiesView.loadChildren = function(args) {
     $('cookiesTree').loadChildren(args[0], args[1]);
   };
 
   // Export
   return {
     CookiesView: CookiesView
   };
 
 });