[NTP4] Fix appmarklet animation drop bug.

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 645 matching lines @@
 
       this.addEventListener('tilePage:tile_added', this.onTileAdded_);
 
       this.content_.addEventListener('scroll', this.onScroll_.bind(this));
     },
 
     /**
      * Similar to appendApp, but it respects the app_launch_ordinal field of
      * |appData|.
      * @param {Object} appData The data that describes the app.
+     * @param {boolean} animate Whether to animate the insertion.
      */
-    insertApp: function(appData) {
+    insertApp: function(appData, animate) {
       var index = this.tileElements_.length;
       for (var i = 0; i < this.tileElements_.length; i++) {
         if (appData.app_launch_ordinal <
             this.tileElements_[i].firstChild.appData.app_launch_ordinal) {
           index = i;
           break;
         }
       }
 
-      this.addTileAt(new App(appData), index, false);
+      this.addTileAt(new App(appData), index, animate);
     },
 
     /**
      * Handler for 'cardselected' event, fired when |this| is selected. The
      * first time this is called, we load all the app icons.
      * @private
      */
     onCardSelected_: function(e) {
       var apps = this.querySelectorAll('.app.icon-loading');
       for (var i = 0; i < apps.length; i++) {
@@ skipping 54 matching lines @@
         return;
       for (var i = 0; i < this.tileElements_.length; i++) {
         var app = this.tileElements_[i].firstChild;
         assert(app instanceof App);
         if (app.currentBubbleShowing_)
           app.currentBubbleShowing_.resizeAndReposition();
         }
     },
 
     /** @inheritDoc */
-    doDragOver: function(e) {
-      var tile = ntp.getCurrentlyDraggingTile();
-      if (tile && !tile.querySelector('.app')) {
-        e.preventDefault();
-        this.setDropEffect(e.dataTransfer);

[Dan Beam, 2012/05/15 01:46:03]

this was avoiding calling TilePage#updateDropIndicator_, which caused the UI not
to reserve drop space for a dragging most visited tile, so I removed this
override (and just let this fall back to TilePage#doDragOver). if this was
intentional (for some reason), I can revert this hunk...

[Evan Stade, 2012/05/15 03:01:11]

yes this is intentional, you will notice that most visited tiles always get
dropped at the end (if you need to know why I can explain offline)

[Dan Beam, 2012/05/15 04:00:44]

OK, fixed outside data handling to match.

-      } else {
-        TilePage.prototype.doDragOver.call(this, e);
-      }
-    },
-
-    /** @inheritDoc */
     shouldAcceptDrag: function(e) {
       if (ntp.getCurrentlyDraggingTile())
         return true;
       if (!e.dataTransfer || !e.dataTransfer.types)
         return false;
       return Array.prototype.indexOf.call(e.dataTransfer.types,
                                           'text/uri-list') != -1;
     },
 
     /** @inheritDoc */
@@ skipping 123 matching lines @@
       app.setupNotification_(notification);
   }
 
   return {
     APP_LAUNCH: APP_LAUNCH,
     appNotificationChanged: appNotificationChanged,
     AppsPage: AppsPage,
     launchAppAfterEnable: launchAppAfterEnable,
   };
 });