summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-20 04:12:54 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-20 04:14:17 +0000
commit5934baeb7e6bcc521e3e6089387302c6ea824fe2 (patch)
tree0880119819905e359cc976006bf46745f287ea62 /printing
parentf2ee6ed79b91e265faa5c3c09b35307aeae7e276 (diff)
downloadchromium_src-5934baeb7e6bcc521e3e6089387302c6ea824fe2.zip
chromium_src-5934baeb7e6bcc521e3e6089387302c6ea824fe2.tar.gz
chromium_src-5934baeb7e6bcc521e3e6089387302c6ea824fe2.tar.bz2
Fixed return value in PrintingContext::OnError().
TBR=noamsml BUG=374321 Review URL: https://codereview.chromium.org/484373002 Cr-Commit-Position: refs/heads/master@{#290759} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/printing_context.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
index bcafb40..c7f22a5 100644
--- a/printing/printing_context.cc
+++ b/printing/printing_context.cc
@@ -44,8 +44,9 @@ void PrintingContext::ResetSettings() {
}
PrintingContext::Result PrintingContext::OnError() {
+ Result result = abort_printing_ ? CANCEL : FAILED;
ResetSettings();
- return abort_printing_ ? CANCEL : FAILED;
+ return result;
}
PrintingContext::Result PrintingContext::UsePdfSettings() {