Added fix for cookie list bug. Used -webkit-box-flex to force the list to fill the box.

NOTRY=true
BUG=121145
TEST=


Review URL: http://codereview.chromium.org/9956088

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

3 files changed, 21 insertions, 5 deletions

diff --git a/chrome/browser/resources/options2/cookies_view.css b/chrome/browser/resources/options2/cookies_view.css
index cc48f8b..41c2d42 100644
--- a/chrome/browser/resources/options2/cookies_view.css
+++ b/chrome/browser/resources/options2/cookies_view.css
@@ -3,12 +3,26 @@
  * found in the LICENSE file. */
 
 /* Styles for the cookies list page. */
-#cookiesViewPage {
+#cookies-view-page {
+  height: 90%;
   margin-left: -15px;
   min-width: 700px;
 }
 
 /* Styles for the cookies list elements in cookies_view.html. */
+#cookies-list {
+  -webkit-box-flex: 1;
+  /* This property overrides the |min-height: 192px;| property above due to
+   * special behavior of the cookies list. */
+  min-height: 0;
+}
+
+#cookies-list-content-area {
+  -webkit-box-orient: vertical;
+  display: -webkit-box;
+  overflow-y: hidden;
+}
+
 #remove-all-cookies-search-column {
   bottom: 10px;
   position: absolute;
diff --git a/chrome/browser/resources/options2/cookies_view.html b/chrome/browser/resources/options2/cookies_view.html
index de7d973..8ef6fa1 100644
--- a/chrome/browser/resources/options2/cookies_view.html
+++ b/chrome/browser/resources/options2/cookies_view.html
@@ -1,10 +1,12 @@
-<div id="cookiesViewPage" class="page" hidden>
+<div id="cookies-view-page" class="page" hidden>
   <div class="close-button"></div>
   <h1 i18n-content="cookiesViewPage"></h1>
-  <div class="content-area">
+  <div id="cookies-list-content-area" class="content-area">
     <div id="cookies-column-headers">
       <div id="cookies-site-column"><h3 i18n-content="cookie_domain"></h3></div>
-      <div id="cookies-data-column"><h3 i18n-content="cookie_local_data"></h3></div>
+      <div id="cookies-data-column">
+        <h3 i18n-content="cookie_local_data"></h3>
+      </div>
       <div id="remove-all-cookies-search-column">
         <button id="remove-all-cookies-button"
             i18n-content="remove_all_cookie"></button>
diff --git a/chrome/browser/resources/options2/cookies_view.js b/chrome/browser/resources/options2/cookies_view.js
index ce02c66..6e0148d 100644
--- a/chrome/browser/resources/options2/cookies_view.js
+++ b/chrome/browser/resources/options2/cookies_view.js
@@ -16,7 +16,7 @@ cr.define('options', function() {
   function CookiesView(model) {
     OptionsPage.call(this, 'cookies',
                      templateData.cookiesViewPageTabTitle,
-                     'cookiesViewPage');
+                     'cookies-view-page');
   }
 
   cr.addSingletonGetter(CookiesView);