Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3740)

Unified Diff: chrome/browser/resources/ntp_search/new_tab.js

Issue 11564026: NTP5: Making Apps page taller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/ntp_search/new_tab.css ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1bb34ebebfc5f2462c14081cfd92492df0e3c5a3..6bfe5d47ea9031b8112222864ab51f30d62199ff 100644
--- a/chrome/browser/resources/ntp_search/new_tab.js
+++ b/chrome/browser/resources/ntp_search/new_tab.js
@@ -735,10 +735,10 @@ cr.define('ntp', function() {
var contentHeight = TILE_ROW_HEIGHT;
if (!opt_page && currentPage.config.scrollable) {
+ footerHeight = $('bottom-panel-footer').offsetHeight;
Dan Beam 2012/12/14 03:44:42 nit: var footerHeight; (make a local)
pedro (no code reviews) 2012/12/14 05:06:33 I would normally create a variable, just for reada
contentHeight = viewHeight - bottomPanelOffsetTop -
headerHeight - footerHeight;
Dan Beam 2012/12/14 03:44:42 or just inline $('bottom-panel-footer').offsetHeig
pedro (no code reviews) 2012/12/14 05:06:33 Done.
contentHeight = Math.max(TILE_ROW_HEIGHT, contentHeight);
- contentHeight = Math.min(2 * TILE_ROW_HEIGHT, contentHeight);
}
this.contentHeight_ = contentHeight;
@@ -808,7 +808,6 @@ cr.define('ntp', function() {
bottomPanelOffsetTop = $('bottom-panel').offsetTop;
headerHeight = $('bottom-panel-header').offsetHeight;
- footerHeight = $('bottom-panel-footer').offsetHeight;
notificationContainer = getRequiredElement('notification-container');
notificationContainer.addEventListener(
@@ -1012,6 +1011,8 @@ cr.define('ntp', function() {
var timeout = opt_timeout || 10000;
notificationTimeout = window.setTimeout(hideNotification, timeout);
+
+ layout();
}
/**
@@ -1019,6 +1020,8 @@ cr.define('ntp', function() {
*/
function hideNotification() {
notificationContainer.classList.add('inactive');
+
+ layout();
}
/**
« no previous file with comments | « chrome/browser/resources/ntp_search/new_tab.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698