NTP: Fix context menu for apps in small and minimized mode.

chrome/browser/resources/ntp/apps.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.
 
 var MAX_APPS_PER_ROW = [];
 MAX_APPS_PER_ROW[LayoutMode.SMALL] = 4;
 MAX_APPS_PER_ROW[LayoutMode.NORMAL] = 6;
 
 // The URL prefix used in the app link 'ping' attributes.
 var PING_APP_LAUNCH_PREFIX = 'record-app-launch';
@@ skipping 79 matching lines @@
 
     var a = div.appendChild(document.createElement('a'));
     a.setAttribute('app-id', app['id']);
     a.setAttribute('launch-type', app['launch_type']);
     a.xtitle = a.textContent = app['name'];
     a.href = app['launch_url'];
 
     return div;
   }
 
-  function createContextMenu(app) {

[arv (Not doing code reviews), 2010/11/19 22:31:36]

dead code

-    var menu = new cr.ui.Menu;
-    var button = document.createElement(button);
-  }
-
   function launchApp(appId) {
     var appsSection = $('apps');
     var expanded = !appsSection.classList.contains('hidden');
     var element = document.querySelector(
         (expanded ? '.maxiview' : '.miniview') + ' a[app-id=' + appId + ']');
 
     // TODO(arv): Handle zoom?
     var rect = element.getBoundingClientRect();
     var cs = getComputedStyle(element);
     var size = cs.backgroundSize.split(/\s+/);  // background-size has the
@@ skipping 52 matching lines @@
     el.addEventListener('keydown', cr.ui.contextMenuHandler);
     el.addEventListener('keyup', cr.ui.contextMenuHandler);
 
     Object.defineProperty(el, 'contextMenu', {
       get: function() {
         currentApp = app;
 
         $('apps-launch-command').label = app['name'];
         $('apps-options-command').canExecuteChange();
 
-        var appLinkSel = '.app a[app-id=' + app['id'] + ']';
-        var launchType =
-            el.querySelector(appLinkSel).getAttribute('launch-type');
+        var launchTypeEl;
+        if (el.getAttribute('app-id') === app['id']) {
+          launchTypeEl = el;
+        } else {
+          appLinkSel = 'a[app-id=' + app['id'] + ']';
+          launchTypeEl = el.querySelector(appLinkSel);
+        }
 
+        var launchType = launchTypeEl.getAttribute('launch-type');
         var launchContainer = app['launch_container'];
         var isPanel = launchContainer == LaunchContainer.LAUNCH_PANEL;
 
         // Update the commands related to the launch type.
         var launchTypeIds = ['apps-launch-type-pinned',
                              'apps-launch-type-regular',
                              'apps-launch-type-fullscreen'];
         launchTypeIds.forEach(function(id) {
           var command = $(id);
           command.disabled = isPanel;
@@ skipping 106 matching lines @@
 
     createClosedMenuElement: function(app) {
       var a = document.createElement('a');
       a.setAttribute('app-id', app['id']);
       a.textContent = app['name'];
       a.href = app['launch_url'];
       a.onclick = handleClick;
       a.setAttribute('ping', PING_APP_LAUNCH_PREFIX + '+' + this.showPromo);
       a.style.backgroundImage = url(app['icon_small']);
       a.className = 'item';
+
+      addContextMenu(a, app);
+
       return a;
     },
 
     createWebStoreElement: function() {
       var elm = createElement({
         'id': 'web-store-entry',
         'name': localStrings.getString('web_store_title'),
         'launch_url': localStrings.getString('web_store_url')
       });
       elm.setAttribute('app-id', 'web-store-entry');
       return elm;
     }
   };
 })();