| Index: printing/printing_context_mac.mm
|
| diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
|
| index 90654e20ad228a86f845b81480e1b99dfe0bede0..cb022113c2d0c8faa8342c84a4696ef067ccf2fd 100644
|
| --- a/printing/printing_context_mac.mm
|
| +++ b/printing/printing_context_mac.mm
|
| @@ -82,7 +82,11 @@ void PrintingContextMac::AskUserForSettings(gfx::NativeView parent_view,
|
| NSInteger selection = [panel runModalWithPrintInfo:printInfo];
|
| if (selection == NSOKButton) {
|
| print_info_.reset([[panel printInfo] retain]);
|
| - InitPrintSettingsFromPrintInfo(GetPageRangesFromPrintInfo());
|
| + DictionaryValue header_footer_info;
|
| + header_footer_info.SetBoolean(printing::kSettingHeaderFooterEnabled,
|
| + false);
|
| + InitPrintSettingsFromPrintInfo(GetPageRangesFromPrintInfo(),
|
| + header_footer_info);
|
| callback->Run(OK);
|
| } else {
|
| callback->Run(CANCEL);
|
| @@ -93,7 +97,11 @@ PrintingContext::Result PrintingContextMac::UseDefaultSettings() {
|
| DCHECK(!in_print_job_);
|
|
|
| print_info_.reset([[NSPrintInfo sharedPrintInfo] copy]);
|
| - InitPrintSettingsFromPrintInfo(GetPageRangesFromPrintInfo());
|
| + DictionaryValue header_footer_info;
|
| + header_footer_info.SetBoolean(printing::kSettingHeaderFooterEnabled,
|
| + false);
|
| + InitPrintSettingsFromPrintInfo(GetPageRangesFromPrintInfo(),
|
| + header_footer_info);
|
|
|
| return OK;
|
| }
|
| @@ -150,12 +158,33 @@ PrintingContext::Result PrintingContextMac::UpdatePrintSettings(
|
|
|
| [print_info_.get() updateFromPMPrintSettings];
|
|
|
| - InitPrintSettingsFromPrintInfo(ranges);
|
| + bool display_header_footer;
|
| + // Getting Header and Footer settings.
|
| + if (!job_settings.GetBoolean(printing::kSettingHeaderFooterEnabled,
|
| + &display_header_footer)) {
|
| + NOTREACHED();
|
| + }
|
| + DictionaryValue header_footer_info;
|
| + header_footer_info.SetBoolean(printing::kSettingHeaderFooterEnabled,
|
| + display_header_footer);
|
| + if (display_header_footer) {
|
| + string16 title;
|
| + std::string url;
|
| + if (!job_settings.GetString(printing::kSettingHeaderFooterTitle, &title) ||
|
| + !job_settings.GetString(printing::kSettingHeaderFooterURL, &url)) {
|
| + NOTREACHED();
|
| + }
|
| + header_footer_info.SetString(printing::kSettingHeaderFooterURL, url);
|
| + header_footer_info.SetString(printing::kSettingHeaderFooterTitle, title);
|
| + }
|
| +
|
| + InitPrintSettingsFromPrintInfo(ranges, header_footer_info);
|
| return OK;
|
| }
|
|
|
| void PrintingContextMac::InitPrintSettingsFromPrintInfo(
|
| - const PageRanges& ranges) {
|
| + const PageRanges& ranges,
|
| + const DictionaryValue& header_footer_info) {
|
| PMPrintSession print_session =
|
| static_cast<PMPrintSession>([print_info_.get() PMPrintSession]);
|
| PMPageFormat page_format =
|
|
|