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

Unified Diff: printing/printing_context_win.cc

Issue 2114583002: Windows: Make it possible to print text with GDI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again, resolve conflicts Created 4 years, 4 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 | « printing/printing_context_system_dialog_win.cc ('k') | printing/printing_context_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing_context_win.cc
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index 4ecb81473ce4518889ffaff116ca473f6c98d145..ebee82e4b4252e77050a53254499a7760feb8430 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) {
+void AssignResult(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(&AssignResult, &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());
return InitializeSettings(settings_.device_name(), scoped_dev_mode.get());
}
« no previous file with comments | « printing/printing_context_system_dialog_win.cc ('k') | printing/printing_context_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698