projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
printing
/
printing_context_win.h
diff --git
a/src/printing/printing_context_win.h
b/src/printing/printing_context_win.h
index
3be4917
..
d0cd2fb
100644
(file)
--- a/
src/printing/printing_context_win.h
+++ b/
src/printing/printing_context_win.h
@@
-14,13
+14,10
@@
#include "build/build_config.h"
#include "printing/printing_context.h"
#include "ui/gfx/native_widget_types.h"
#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 {
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();
public:
explicit PrintingContextWin(const std::string& app_locale);
~PrintingContextWin();
@@
-43,10
+40,6
@@
class PRINTING_EXPORT PrintingContextWin
virtual void ReleaseContext() OVERRIDE;
virtual gfx::NativeDrawingContext context() const OVERRIDE;
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)) {
#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
@@
class PRINTING_EXPORT PrintingContextWin
// SetPrintDialog() in tests.
HRESULT (__stdcall *print_dialog_func_)(LPPRINTDLGEX);
// 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);
};
DISALLOW_COPY_AND_ASSIGN(PrintingContextWin);
};