Chromium Code Reviews| Index: chrome/browser/resources/ntp_search/new_tab.js |
| diff --git a/chrome/browser/resources/ntp_search/new_tab.js b/chrome/browser/resources/ntp_search/new_tab.js |
| index 25a18a3f2e586baf09633fdbfdf2c1100d3b3d77..6fdc7ac52bacf50cee886907afa5b5ac92a5a83d 100644 |
| --- a/chrome/browser/resources/ntp_search/new_tab.js |
| +++ b/chrome/browser/resources/ntp_search/new_tab.js |
| @@ -427,23 +427,8 @@ cr.define('ntp', function() { |
| getAppsCallback: function(data) { |
| assert(loadTimeData.getBoolean('showApps')); |
| - var page = this.appsPage; |
| - var state = page && page.getTileRepositioningState(); |
|
Dan Beam
2012/12/05 18:40:44
^ so why is all this logic being removed?
pedro (no code reviews)
2012/12/05 20:03:55
This logic was placed in the wrong spot. It has be
|
| - if (state) { |
| - if (state.isRemoving) |
| - page.animateTileRemoval(state.index, data); |
| - else |
| - page.animateTileRestoration(state.index, data); |
| - |
| - page.resetTileRepositioningState(); |
| - return; |
| - } |
| - |
| var startTime = Date.now(); |
| - if (page) |
| - page.removeAllTiles(); |
| - |
| // Get the array of apps and add any special synthesized entries. |
| var apps = data.apps; |
| @@ -457,8 +442,10 @@ cr.define('ntp', function() { |
| var highlightApp; |
| // Add the apps, creating pages as necessary. |
| - this.appendTilePage(new ntp.AppsPage(), |
| - loadTimeData.getString('appDefaultPageName')); |
| + var page = new ntp.AppsPage(); |
| + page.setDataList(apps, false); |
| + |
| + this.appendTilePage(page, loadTimeData.getString('appDefaultPageName')); |
| for (var i = 0; i < apps.length; i++) { |
| var app = apps[i]; |
| if (app.id == this.highlightAppId) |