[Printing] Make PrintSettings non-copyable.
This is the "safe" version of the change where PrintSettings in
PrintingContext always exists. Unnecessary PrintSettings instances
would have to be removed in follow-up CL.
Bug: 964948
Change-Id: I88903473b7b2881cbf63543a86227ead2898eae0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1646772
Commit-Queue: Bo <[email protected]>
Auto-Submit: Vladislav Kuzkokov <[email protected]>
Reviewed-by: Bo <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#685983}
diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc
index 1c2d08a7..a53e404 100644
--- a/printing/printing_context_system_dialog_win.cc
+++ b/printing/printing_context_system_dialog_win.cc
@@ -132,11 +132,11 @@
}
}
- settings_.set_ranges(ranges_vector);
- settings_.set_device_name(new_device_name);
- settings_.set_selection_only(selection_only);
+ settings_->set_ranges(ranges_vector);
+ settings_->set_device_name(new_device_name);
+ settings_->set_selection_only(selection_only);
PrintSettingsInitializerWin::InitPrintSettings(context(), dev_mode,
- &settings_);
+ settings_.get());
return true;
}
@@ -146,11 +146,11 @@
// If the user clicked OK or Apply then Cancel, but not only Cancel.
if (dialog_options.dwResultAction != PD_RESULT_CANCEL) {
// Start fresh, but preserve is_modifiable and GDI print setting.
- bool is_modifiable = settings_.is_modifiable();
- bool print_text_with_gdi = settings_.print_text_with_gdi();
+ bool is_modifiable = settings_->is_modifiable();
+ bool print_text_with_gdi = settings_->print_text_with_gdi();
ResetSettings();
- settings_.set_is_modifiable(is_modifiable);
- settings_.set_print_text_with_gdi(print_text_with_gdi);
+ settings_->set_is_modifiable(is_modifiable);
+ settings_->set_print_text_with_gdi(print_text_with_gdi);
DEVMODE* dev_mode = NULL;
if (dialog_options.hDevMode) {
