Windows: Make it possible to print text with GDI.

printing/printing_context_win.cc

Index: printing/printing_context_win.cc
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index 4ecb81473ce4518889ffaff116ca473f6c98d145..2824923bf9a7c9812f19c62890daf823d1e34201 100644
--- a/printing/printing_context_win.cc
+++ b/printing/printing_context_win.cc
@@ -26,7 +26,7 @@ namespace printing {
 
 namespace {
 
-void AssingResult(PrintingContext::Result* out, PrintingContext::Result in) {

[scottmg, 2016/06/30 17:48:31]

(probably meant to be "assign"? not sure)

[Lei Zhang, 2016/06/30 22:29:35]

Oh, ya, that would make more sense. :)

+void PassingResult(PrintingContext::Result* out, PrintingContext::Result in) {
   *out = in;
 }
 
@@ -35,10 +35,10 @@ void AssingResult(PrintingContext::Result* out, PrintingContext::Result in) {
 // static
 std::unique_ptr<PrintingContext> PrintingContext::Create(Delegate* delegate) {
 #if defined(ENABLE_BASIC_PRINTING)
-  return base::WrapUnique(new PrintingContextSytemDialogWin(delegate));
-#else   // ENABLE_BASIC_PRINTING
+  return base::WrapUnique(new PrintingContextSystemDialogWin(delegate));
+#else
   return base::WrapUnique(new PrintingContextWin(delegate));
-#endif  // EENABLE_BASIC_PRINTING
+#endif
 }
 
 PrintingContextWin::PrintingContextWin(Delegate* delegate)
@@ -209,12 +209,11 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings(
   if (show_system_dialog) {
     PrintingContext::Result result = PrintingContext::FAILED;
     AskUserForSettings(page_count, false, false,
-                       base::Bind(&AssingResult, &result));
+                       base::Bind(&PassingResult, &result));
     return result;
-  } else {
-    scoped_dev_mode = CreateDevMode(printer.Get(), scoped_dev_mode.get());
   }
   // Set printer then refresh printer settings.
+  scoped_dev_mode = CreateDevMode(printer.Get(), scoped_dev_mode.get());

[scottmg, 2016/06/30 17:48:31]

I don't understand this change, why do we need to always do this now?

[Lei Zhang, 2016/06/30 22:29:35]

It's an else after return. e.g.

if (foo)
  return bar;
else
  qux;

is the same as:

if (foo)
  return bar;
qux;

[scottmg, 2016/06/30 22:31:53]

Doh sorry, missed the return.

   return InitializeSettings(settings_.device_name(), scoped_dev_mode.get());
 }