Chrome Apps Page: Fixed issue with app focusing and context.

chrome/browser/resources/ntp4/apps_page.js

 // Copyright (c) 2012 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('ntp', function() {
   'use strict';
 
   var APP_LAUNCH = {
     // The histogram buckets (keep in sync with extension_constants.h).
     NTP_APPS_MAXIMIZED: 0,
@@ skipping 277 matching lines @@
         return self.contextMenu;
       });
 
       if (!this.appData_.kioskMode) {
         this.appContents_.addEventListener('contextmenu',
                                            cr.ui.contextMenuHandler);
       }
 
       this.addEventListener('mousedown', this.onMousedown_, true);
       this.addEventListener('keydown', this.onKeydown_);
-      this.addEventListener('keyup', this.onKeyup_);
+      this.addEventListener('blur', this.onBlur_);
     },
 
     /**
      * Sets the color of the favicon dominant color bar.
      * @param {string} color The css-parsable value for the color.
      */
     set stripeColor(color) {
       this.querySelector('.color-stripe').style.backgroundColor = color;
     },
 
@@ skipping 62 matching lines @@
         this.imgDiv_.style.marginTop = this.imgDiv_.style.marginBottom =
             toCssPx((imgSize - iconSize) / 2);
       }
 
       this.style.width = this.style.height = toCssPx(size);
       this.style.left = toCssPx(x);
       this.style.right = toCssPx(x);
       this.style.top = toCssPx(y);
     },
 
+    onBlur_: function(e) {
+      this.classList.remove('click-focus');
+      this.appContents_.classList.remove('suppress-active');
+    },
+
     /**
      * Invoked when an app is clicked.
      * @param {Event} e The click event.
      * @private
      */
     onClick_: function(e) {
       var url = !this.appData_.is_webstore ? '' :
           appendParam(this.appData_.url,
                       'utm_source',
                       'chrome-ntp-icon');
@@ skipping 12 matching lines @@
      * @private
      */
     onKeydown_: function(e) {
       if (e.keyIdentifier == 'Enter') {
         chrome.send('launchApp',
                     [this.appId, APP_LAUNCH.NTP_APPS_MAXIMIZED, '',
                      0, e.altKey, e.ctrlKey, e.metaKey, e.shiftKey]);
         e.preventDefault();
         e.stopPropagation();
       }
-      this.onKeyboardUsed_(e.keyCode);
-    },
-
-    /**
-     * Invoked when the user releases a key while the app is focused.
-     * @param {Event} e The key event.
-     * @private
-     */
-    onKeyup_: function(e) {
-      this.onKeyboardUsed_(e.keyCode);
-    },
-
-    /**
-     * Called when the keyboard has been used (key down or up). The .click-focus
-     * hack is removed if the user presses a key that can change focus.
-     * @param {number} keyCode The key code of the keyboard event.
-     * @private
-     */
-    onKeyboardUsed_: function(keyCode) {
-      switch (keyCode) {
-        case 9:  // Tab.
-        case 37:  // Left arrow.
-        case 38:  // Up arrow.
-        case 39:  // Right arrow.
-        case 40:  // Down arrow.
-          this.classList.remove('click-focus');
-      }
     },
 
     /**
      * Adds a node to the list of targets that will launch the app. This list
      * is also used in onMousedown to determine whether the app contents should
      * be shown as active (if we don't do this, then clicking anywhere in
      * appContents, even a part that is outside the ideally clickable region,
      * will cause the app icon to look active).
      * @param {HTMLElement} node The node that should be clickable.
      */
@@ skipping 337 matching lines @@
   function launchAppAfterEnable(appId) {
     chrome.send('launchApp', [appId, APP_LAUNCH.NTP_APP_RE_ENABLE]);
   }
 
   return {
     APP_LAUNCH: APP_LAUNCH,
     AppsPage: AppsPage,
     launchAppAfterEnable: launchAppAfterEnable,
   };
 });