Print Preview: Hiding header/footer options when 'no margins' is selected

chrome/browser/resources/print_preview/header_footer_settings.js

Index: chrome/browser/resources/print_preview/header_footer_settings.js
diff --git a/chrome/browser/resources/print_preview/header_footer_settings.js b/chrome/browser/resources/print_preview/header_footer_settings.js
index 50b645ed762ad43aefb23b8e1511a1561da43130..68d74e1730b982fcfbfc818d36935c89afd6c2b1 100644
--- a/chrome/browser/resources/print_preview/header_footer_settings.js
+++ b/chrome/browser/resources/print_preview/header_footer_settings.js
@@ -13,6 +13,7 @@ cr.define('print_preview', function() {
   function HeaderFooterSettings() {
     this.headerFooterOption_ = $('header-footer-option');
     this.headerFooterCheckbox_ = $('header-footer');
+    this.headerFooterApplies_;

[Lei Zhang, 2011/11/29 19:45:15]

do you need to initialize this here?

[dpapad, 2011/11/29 20:40:26]

Done. This is supposed to be initialized elsewhere (in
onMarginsSelectionChanged_) before being used, so I had it like that to check if
that is true.

     this.addEventListeners_();
   }
 
@@ -32,7 +33,7 @@ cr.define('print_preview', function() {
      * @return {boolean} true if Headers and Footers are checked.
      */
     hasHeaderFooter: function() {
-      return this.headerFooterCheckbox_.checked;
+      return this.headerFooterApplies_ && this.headerFooterCheckbox_.checked;
     },
 
     /**
@@ -44,6 +45,14 @@ cr.define('print_preview', function() {
           this.onHeaderFooterChanged_.bind(this);
       document.addEventListener(customEvents.PDF_LOADED,
                                 this.onPDFLoaded_.bind(this));
+      document.addEventListener(customEvents.MARGINS_SELECTION_CHANGED,
+                                this.onMarginsSelectionChanged_.bind(this));
+    },
+
+    onMarginsSelectionChanged_: function(event) {
+      this.headerFooterApplies_ = event.selectedMargins !=
+          print_preview.MarginSettings.MARGINS_VALUE_NO_MARGINS
+      this.setVisible_(this.headerFooterApplies_);
     },
 
     /**
@@ -60,10 +69,20 @@ cr.define('print_preview', function() {
      * @private
      */
     onPDFLoaded_: function() {
-      if (!previewModifiable) {
+      if (!previewModifiable)
+        this.setVisible_(previewModifiable);

[Lei Zhang, 2011/11/29 19:45:15]

isn't this always false here?

[dpapad, 2011/11/29 20:40:26]

Done.

+    },
+
+    /**
+     * Hides or shows |this.headerFooterOption|.
+     * @{param} visible True if |this.headerFooterOption| should be shown.
+     * @private
+     */
+    setVisible_: function(visible) {
+      if (visible)
+        fadeInOption(this.headerFooterOption_);
+      else
         fadeOutOption(this.headerFooterOption_);
-        this.headerFooterCheckbox_.checked = false;
-      }
     },
   };