PrintPreview: Honor the print media page size and margin values.

chrome/browser/ui/webui/print_preview_ui.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
@@ skipping 184 matching lines @@
 
 void PrintPreviewUI::OnDidGetPreviewPageCount(
     const PrintHostMsg_DidGetPreviewPageCount_Params& params) {
   DCHECK_GT(params.page_count, 0);
   base::FundamentalValue count(params.page_count);
   base::FundamentalValue request_id(params.preview_request_id);
   CallJavascriptFunction("onDidGetPreviewPageCount", count, request_id);
 }
 
 void PrintPreviewUI::OnDidGetDefaultPageLayout(
-    const PageSizeMargins& page_layout) {
+    const PageSizeMargins& page_layout, bool has_custom_page_size_style) {
   if (page_layout.margin_top < 0 || page_layout.margin_left < 0 ||
       page_layout.margin_bottom < 0 || page_layout.margin_right < 0 ||
       page_layout.content_width < 0 || page_layout.content_height < 0) {
     NOTREACHED();
     return;
   }
 
   base::DictionaryValue layout;
   layout.SetDouble(printing::kSettingMarginTop, page_layout.margin_top);
   layout.SetDouble(printing::kSettingMarginLeft, page_layout.margin_left);
   layout.SetDouble(printing::kSettingMarginBottom, page_layout.margin_bottom);
   layout.SetDouble(printing::kSettingMarginRight, page_layout.margin_right);
   layout.SetDouble(printing::kSettingContentWidth, page_layout.content_width);
   layout.SetDouble(printing::kSettingContentHeight, page_layout.content_height);
 
-  CallJavascriptFunction("onDidGetDefaultPageLayout", layout);
+  base::FundamentalValue has_page_size_style(has_custom_page_size_style);
+  CallJavascriptFunction("onDidGetDefaultPageLayout", layout,
+                         has_page_size_style);
 }
 
 void PrintPreviewUI::OnDidPreviewPage(int page_number,
                                       int preview_request_id) {
   DCHECK_GE(page_number, 0);
   base::FundamentalValue number(page_number);
   StringValue ui_identifier(preview_ui_addr_str_);
   base::FundamentalValue request_id(preview_request_id);
   CallJavascriptFunction("onDidPreviewPage", number, ui_identifier, request_id);
 }
@@ skipping 71 matching lines @@
   ConstrainedHtmlUIDelegate* delegate = GetConstrainedDelegate();
   if (!delegate)
     return;
   delegate->GetHtmlDialogUIDelegate()->OnDialogClosed("");
   delegate->OnDialogCloseFromWebUI();
 }
 
 void PrintPreviewUI::OnReloadPrintersList() {
   CallJavascriptFunction("reloadPrintersList");
 }