| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "printing/printing_context.h" | 5 #include "printing/printing_context.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "printing/page_setup.h" | 9 #include "printing/page_setup.h" |
| 10 #include "printing/page_size_margins.h" | 10 #include "printing/page_size_margins.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 gfx::Rect paper_rect(0, 0, paper_size.width(), paper_size.height()); | 107 gfx::Rect paper_rect(0, 0, paper_size.width(), paper_size.height()); |
| 108 if (print_to_cloud || print_with_privet) { | 108 if (print_to_cloud || print_with_privet) { |
| 109 paper_rect.Inset( | 109 paper_rect.Inset( |
| 110 kCloudPrintMarginInch * settings_.device_units_per_inch(), | 110 kCloudPrintMarginInch * settings_.device_units_per_inch(), |
| 111 kCloudPrintMarginInch * settings_.device_units_per_inch()); | 111 kCloudPrintMarginInch * settings_.device_units_per_inch()); |
| 112 } | 112 } |
| 113 settings_.SetPrinterPrintableArea(paper_size, paper_rect, true); | 113 settings_.SetPrinterPrintableArea(paper_size, paper_rect, true); |
| 114 return OK; | 114 return OK; |
| 115 } | 115 } |
| 116 | 116 |
| 117 return UpdatePrinterSettings(open_in_external_preview); | 117 bool show_system_dialog = false; |
| 118 job_settings.GetBoolean(printing::kSettingShowSystemDialog, |
| 119 &show_system_dialog); |
| 120 |
| 121 return UpdatePrinterSettings(open_in_external_preview, show_system_dialog); |
| 118 } | 122 } |
| 119 | 123 |
| 120 } // namespace printing | 124 } // namespace printing |
| OLD | NEW |