diff options
| author | arthurhsu@chromium.org <arthurhsu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 05:31:00 +0000 |
|---|---|---|
| committer | arthurhsu@chromium.org <arthurhsu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 05:31:00 +0000 |
| commit | c7a90019bf7054145b11d2577b851cf2779d3d79 (patch) | |
| tree | 18ed5d8349b2e3d37767fd84e5f23fd162b3ede6 /printing | |
| parent | 19cc5b468085104e660cc977987e1b78ad99db13 (diff) | |
| download | chromium_src-c7a90019bf7054145b11d2577b851cf2779d3d79.zip chromium_src-c7a90019bf7054145b11d2577b851cf2779d3d79.tar.gz chromium_src-c7a90019bf7054145b11d2577b851cf2779d3d79.tar.bz2 | |
Fix print preview workflow to reflect settings of selected printer.
BUG=95110
TEST=none
Review URL: http://codereview.chromium.org/7831041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/print_settings_initializer_win.cc | 4 | ||||
| -rw-r--r-- | printing/printing_context_cairo.cc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/printing/print_settings_initializer_win.cc b/printing/print_settings_initializer_win.cc index 065a8db..0f6a930 100644 --- a/printing/print_settings_initializer_win.cc +++ b/printing/print_settings_initializer_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -23,7 +23,7 @@ void PrintSettingsInitializerWin::InitPrintSettings( print_settings->set_printer_name(dev_mode.dmDeviceName); print_settings->set_device_name(new_device_name); - print_settings->ranges = new_ranges; + print_settings->ranges = const_cast<PageRanges&>(new_ranges); print_settings->set_landscape(dev_mode.dmOrientation == DMORIENT_LANDSCAPE); print_settings->selection_only = print_selection_only; diff --git a/printing/printing_context_cairo.cc b/printing/printing_context_cairo.cc index 16eb837..c4a7105 100644 --- a/printing/printing_context_cairo.cc +++ b/printing/printing_context_cairo.cc @@ -155,6 +155,11 @@ PrintingContext::Result PrintingContextCairo::UpdatePrinterSettings( #else DCHECK(!in_print_job_); + if (!print_dialog_) { + print_dialog_ = create_dialog_func_(this); + print_dialog_->AddRefToDialog(); + } + if (!print_dialog_->UpdateSettings(job_settings, ranges)) return OnError(); |