From 169e4f21c7799e81bcff1b476e894409450ad2ce Mon Sep 17 00:00:00 2001
From: "dpapad@chromium.org"
 <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 31 Jan 2012 02:03:16 +0000
Subject: Print Preview: Making header footer setting sticky.

BUG=111501
TEST=Print a doc with headers and footers enabled or disabled. Open print preview again, last setting should be remembered.


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119814 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../browser/resources/print_preview/header_footer_settings.html  | 2 +-
 chrome/browser/resources/print_preview/header_footer_settings.js | 9 +++++++++
 chrome/browser/resources/print_preview/print_preview.js          | 5 +++--
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'chrome/browser/resources/print_preview')

diff --git a/chrome/browser/resources/print_preview/header_footer_settings.html b/chrome/browser/resources/print_preview/header_footer_settings.html
index 0ba3e6c..1082709 100644
--- a/chrome/browser/resources/print_preview/header_footer_settings.html
+++ b/chrome/browser/resources/print_preview/header_footer_settings.html
@@ -2,7 +2,7 @@
   <h1 i18n-content="optionsLabel"></h1>
   <div class="right-column">
     <label>
-      <input id="header-footer" type="checkbox" checked>
+      <input id="header-footer" type="checkbox" />
       <span i18n-content="optionHeaderFooter"></span>
     </label>
   </div>
diff --git a/chrome/browser/resources/print_preview/header_footer_settings.js b/chrome/browser/resources/print_preview/header_footer_settings.js
index f1155d0..02776c5 100644
--- a/chrome/browser/resources/print_preview/header_footer_settings.js
+++ b/chrome/browser/resources/print_preview/header_footer_settings.js
@@ -37,6 +37,15 @@ cr.define('print_preview', function() {
     },
 
     /**
+     * Sets the state of the headers footers checkbox.
+     * @param {boolean} checked True if the headers footers checkbox shoule be
+     *     checked, false if not.
+     */
+    setChecked: function(checked) {
+      this.headerFooterCheckbox_.checked = checked;
+    },
+
+    /**
      * Adding listeners to header footer related controls.
      * @private
      */
diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js
index e1c9566..f549cc8 100644
--- a/chrome/browser/resources/print_preview/print_preview.js
+++ b/chrome/browser/resources/print_preview/print_preview.js
@@ -196,10 +196,11 @@ function setInitialSettings(initialSettings) {
         initialSettings['measurementSystem']);
     marginSettings.setLastUsedMargins(initialSettings);
   }
-  setDefaultPrinter(initialSettings['printerName'],
-                    initialSettings['cloudPrintData']);
   printAutomaticallyInKioskMode =
       initialSettings['printAutomaticallyInKioskMode'];
+  headerFooterSettings.setChecked(initialSettings['headerFooterEnabled']);
+  setDefaultPrinter(initialSettings['printerName'],
+                    initialSettings['cloudPrintData']);
 }
 
 /**
-- 
cgit v1.1