From 83572f22a6fc590185dcc7d112a63be611e4be8d Mon Sep 17 00:00:00 2001 From: vitalybuka Date: Mon, 23 Feb 2015 11:50:15 -0800 Subject: Remove unused code Review URL: https://codereview.chromium.org/932543003 Cr-Commit-Position: refs/heads/master@{#317629} --- printing/printing_context.cc | 2 -- printing/printing_context.h | 3 --- printing/printing_context_system_dialog_win.cc | 11 +---------- printing/printing_context_system_dialog_win.h | 4 ---- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/printing/printing_context.cc b/printing/printing_context.cc index 3528828..a589900 100644 --- a/printing/printing_context.cc +++ b/printing/printing_context.cc @@ -20,7 +20,6 @@ const float kCloudPrintMarginInch = 0.25; PrintingContext::PrintingContext(Delegate* delegate) : delegate_(delegate), - dialog_box_dismissed_(false), in_print_job_(false), abort_printing_(false) { CHECK(delegate_); @@ -40,7 +39,6 @@ void PrintingContext::ResetSettings() { settings_.Clear(); in_print_job_ = false; - dialog_box_dismissed_ = false; abort_printing_ = false; } diff --git a/printing/printing_context.h b/printing/printing_context.h index 40c8d33..0d9f605 100644 --- a/printing/printing_context.h +++ b/printing/printing_context.h @@ -139,9 +139,6 @@ class PRINTING_EXPORT PrintingContext { // Printing context delegate. Delegate* delegate_; - // The dialog box has been dismissed. - volatile bool dialog_box_dismissed_; - // Is a print job being done. volatile bool in_print_job_; diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc index b89f1a4e..e67ae3b 100644 --- a/printing/printing_context_system_dialog_win.cc +++ b/printing/printing_context_system_dialog_win.cc @@ -13,7 +13,7 @@ namespace printing { PrintingContextSytemDialogWin::PrintingContextSytemDialogWin(Delegate* delegate) - : PrintingContextWin(delegate), dialog_box_(NULL) { + : PrintingContextWin(delegate) { } PrintingContextSytemDialogWin::~PrintingContextSytemDialogWin() { @@ -25,7 +25,6 @@ void PrintingContextSytemDialogWin::AskUserForSettings( bool is_scripted, const PrintSettingsCallback& callback) { DCHECK(!in_print_job_); - dialog_box_dismissed_ = false; HWND window = GetRootWindow(delegate_->GetParentView()); DCHECK(window); @@ -76,14 +75,6 @@ void PrintingContextSytemDialogWin::AskUserForSettings( callback.Run(ParseDialogResultEx(dialog_options)); } -void PrintingContextSytemDialogWin::Cancel() { - PrintingContextWin::Cancel(); - if (dialog_box_) { - DestroyWindow(dialog_box_); - dialog_box_dismissed_ = true; - } -} - HRESULT PrintingContextSytemDialogWin::ShowPrintDialog(PRINTDLGEX* options) { // Runs always on the UI thread. static bool is_dialog_shown = false; diff --git a/printing/printing_context_system_dialog_win.h b/printing/printing_context_system_dialog_win.h index 216cdd3..5e11aa5 100644 --- a/printing/printing_context_system_dialog_win.h +++ b/printing/printing_context_system_dialog_win.h @@ -27,7 +27,6 @@ class PRINTING_EXPORT PrintingContextSytemDialogWin bool has_selection, bool is_scripted, const PrintSettingsCallback& callback) override; - virtual void Cancel() override; private: friend class MockPrintingContextWin; @@ -46,9 +45,6 @@ class PRINTING_EXPORT PrintingContextSytemDialogWin Result ParseDialogResultEx(const PRINTDLGEX& dialog_options); Result ParseDialogResult(const PRINTDLG& dialog_options); - // The dialog box for the time it is shown. - volatile HWND dialog_box_; - DISALLOW_COPY_AND_ASSIGN(PrintingContextSytemDialogWin); }; -- cgit v1.1