[ntp4] Apply style tweaks so that bookmarks page scrolls correctly.

BUG=none
Review URL: http://codereview.chromium.org/7622020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96895 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 4 deletions

diff --git a/chrome/browser/resources/ntp4/bookmarks_page.css b/chrome/browser/resources/ntp4/bookmarks_page.css
index d30dd3f..6b66cc8 100644
--- a/chrome/browser/resources/ntp4/bookmarks_page.css
+++ b/chrome/browser/resources/ntp4/bookmarks_page.css
@@ -110,6 +110,11 @@ html[dir=rtl] .bookmark .close-button {
   white-space: nowrap;
 }
 
+/* Add padding to tile page content to adjust for title wrapper. */
+.bookmarks-page .tile-page-content {
+  padding-bottom: 48px;
+}
+
 #bookmarks-title-wrapper .title-crumb {
   cursor: pointer;
   margin: 0 25px;
diff --git a/chrome/browser/resources/ntp4/tile_page.js b/chrome/browser/resources/ntp4/tile_page.js
index 8d126a9..a6daf9a 100644
--- a/chrome/browser/resources/ntp4/tile_page.js
+++ b/chrome/browser/resources/ntp4/tile_page.js
@@ -793,16 +793,20 @@ cr.define('ntp4', function() {
       this.scrollbarUpdate_ = 0;
 
       var content = this.content_;
-      if (content.scrollHeight == content.clientHeight) {
+
+      // Adjust height to account for possible header-bar.
+      var adjustedClientHeight = content.clientHeight - content.offsetTop;
+
+      if (content.scrollHeight == adjustedClientHeight) {
         this.scrollbar_.hidden = true;
         return;
       } else {
         this.scrollbar_.hidden = false;
       }
 
-      var thumbTop = content.scrollTop / content.scrollHeight *
-          this.clientHeight;
-      var thumbHeight = content.clientHeight / content.scrollHeight *
+      var thumbTop = content.offsetTop +
+          content.scrollTop / content.scrollHeight * adjustedClientHeight;
+      var thumbHeight = adjustedClientHeight / content.scrollHeight *
           this.clientHeight;
 
       this.scrollbar_.style.top = thumbTop + 'px';