Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1193)

Unified Diff: trunk/src/printing/printing_context_win.h

Issue 164013002: Revert 230235 "Use BaseShellDialog for print dialog on Windows" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/printing/printing.gyp ('k') | trunk/src/printing/printing_context_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/printing/printing_context_win.h
===================================================================
--- trunk/src/printing/printing_context_win.h (revision 251065)
+++ trunk/src/printing/printing_context_win.h (working copy)
@@ -14,13 +14,10 @@
#include "build/build_config.h"
#include "printing/printing_context.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/shell_dialogs/print_settings_dialog_win.h"
namespace printing {
-class PRINTING_EXPORT PrintingContextWin
- : public PrintingContext,
- public ui::PrintSettingsDialogWin::Observer {
+class PRINTING_EXPORT PrintingContextWin : public PrintingContext {
public:
explicit PrintingContextWin(const std::string& app_locale);
~PrintingContextWin();
@@ -43,10 +40,6 @@
virtual void ReleaseContext() OVERRIDE;
virtual gfx::NativeDrawingContext context() const OVERRIDE;
- // PrintSettingsDialogWin::Observer implementation:
- virtual void PrintSettingsConfirmed(PRINTDLGEX* dialog_options) OVERRIDE;
- virtual void PrintSettingsCancelled(PRINTDLGEX* dialog_options) OVERRIDE;
-
#if defined(UNIT_TEST) || defined(PRINTING_IMPLEMENTATION)
// Sets a fake PrintDlgEx function pointer in tests.
void SetPrintDialog(HRESULT (__stdcall *print_dialog_func)(LPPRINTDLGEX)) {
@@ -94,12 +87,6 @@
// SetPrintDialog() in tests.
HRESULT (__stdcall *print_dialog_func_)(LPPRINTDLGEX);
- // Where to notify when the dialog is closed.
- PrintSettingsCallback callback_;
-
- // Wrapper around native print dialog that runs it on a background thread.
- scoped_refptr<ui::PrintSettingsDialogWin> print_settings_dialog_;
-
DISALLOW_COPY_AND_ASSIGN(PrintingContextWin);
};
« no previous file with comments | « trunk/src/printing/printing.gyp ('k') | trunk/src/printing/printing_context_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698