| Index: printing/printing_context_win.cc
|
| diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
|
| index e4e4ba2cf11af2b6df710c6d33d3d95fa5c0cf28..e46e861a2cd2f7ae066264701d1454e10f7a3d00 100644
|
| --- a/printing/printing_context_win.cc
|
| +++ b/printing/printing_context_win.cc
|
| @@ -370,33 +370,4 @@ HWND PrintingContextWin::GetRootWindow(gfx::NativeView view) {
|
| return window;
|
| }
|
|
|
| -scoped_ptr<DEVMODE, base::FreeDeleter> PrintingContextWin::ShowPrintDialog(
|
| - HANDLE printer,
|
| - gfx::NativeView parent_view,
|
| - DEVMODE* dev_mode) {
|
| - // Note that this cannot use ui::BaseShellDialog as the print dialog is
|
| - // system modal: opening it from a background thread can cause Windows to
|
| - // get the wrong Z-order which will make the print dialog appear behind the
|
| - // browser frame (but still being modal) so neither the browser frame nor
|
| - // the print dialog will get any input. See http://crbug.com/342697
|
| - // http://crbug.com/180997 for details.
|
| - base::MessageLoop::ScopedNestableTaskAllower allow(
|
| - base::MessageLoop::current());
|
| -
|
| - bool canceled = false;
|
| - scoped_ptr<DEVMODE, base::FreeDeleter> result =
|
| - PromptDevMode(printer,
|
| - settings_.device_name(),
|
| - dev_mode,
|
| - GetRootWindow(parent_view),
|
| - &canceled);
|
| -
|
| - if (canceled) {
|
| - result.reset();
|
| - abort_printing_ = true;
|
| - }
|
| -
|
| - return result.Pass();
|
| -}
|
| -
|
| } // namespace printing
|
|
|