|
|
Chromium Code Reviews|
Created:
6 years, 10 months ago by Vitaly Buka (NO REVIEWS) Modified:
6 years, 10 months ago Reviewers:
Noam Samuel CC:
chromium-reviews Base URL:
svn://svn.chromium.org/chrome/trunk/src Visibility:
Public. |
DescriptionUse DocumentProperties to get default DEVMODE instead of PRINTER_INFO_*.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=252221
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=253076
Patch Set 1 #Patch Set 2 : #Patch Set 3 : #Patch Set 4 : #Patch Set 5 : #Patch Set 6 : #Patch Set 7 : #Patch Set 8 : #
Messages
Total messages: 39 (0 generated)
lgtm
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/110001
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for printing/backend/print_backend_win.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file printing/backend/print_backend_win.cc
Hunk #1 succeeded at 213 (offset -1 lines).
Hunk #2 FAILED at 227.
Hunk #3 succeeded at 312 (offset -1 lines).
Hunk #4 succeeded at 343 (offset -1 lines).
Hunk #5 succeeded at 351 (offset -1 lines).
1 out of 5 hunks FAILED -- saving rejects to file
printing/backend/print_backend_win.cc.rej
Patch: printing/backend/print_backend_win.cc
Index: printing/backend/print_backend_win.cc
diff --git a/printing/backend/print_backend_win.cc
b/printing/backend/print_backend_win.cc
index
bb7989f43d29c2d680af18afbe06c9ea9223df1a..008fc15b78fe0d5fe9f76ce505966f97150194ef
100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -214,7 +214,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
const std::string& printer_name,
PrinterSemanticCapsAndDefaults* printer_info) {
ScopedPrinterHandle printer_handle;
- if (!printer_handle.OpenPrinter(base::UTF8ToWide(printer_name).c_str())) {
+ if (!printer_handle.OpenPrinter(base::UTF8ToWide(printer_name))) {
LOG(WARNING) << "Failed to open printer, error = " << GetLastError();
return false;
}
@@ -227,8 +227,9 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
DCHECK_EQ(name, base::UTF8ToUTF16(printer_name));
PrinterSemanticCapsAndDefaults caps;
- UserDefaultDevMode user_settings;
- if (user_settings.Init(printer_handle)) {
+
+ scoped_ptr<DEVMODE[]> user_settings = CreateDevMode(printer_handle, NULL);
+ if (user_settings) {
if ((user_settings.get()->dmFields & DM_COLOR) == DM_COLOR)
caps.color_default = (user_settings.get()->dmColor == DMCOLOR_COLOR);
@@ -313,7 +314,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
printer_info->caps_mime_type = "text/xml";
}
ScopedPrinterHandle printer_handle;
- if (printer_handle.OpenPrinter(printer_name_wide.c_str())) {
+ if (printer_handle.OpenPrinter(printer_name_wide)) {
scoped_ptr<DEVMODE[]> devmode_out(CreateDevMode(printer_handle, NULL));
if (!devmode_out)
return false;
@@ -344,7 +345,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
std::string PrintBackendWin::GetPrinterDriverInfo(
const std::string& printer_name) {
ScopedPrinterHandle printer;
- if (!printer.OpenPrinter(base::UTF8ToWide(printer_name).c_str())) {
+ if (!printer.OpenPrinter(base::UTF8ToWide(printer_name))) {
return std::string();
}
return GetDriverInfo(printer);
@@ -352,7 +353,7 @@ std::string PrintBackendWin::GetPrinterDriverInfo(
bool PrintBackendWin::IsValidPrinter(const std::string& printer_name) {
ScopedPrinterHandle printer_handle;
- return printer_handle.OpenPrinter(base::UTF8ToWide(printer_name).c_str());
+ return printer_handle.OpenPrinter(base::UTF8ToWide(printer_name));
}
scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
The CQ bit was checked by vitalybuka@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/180001
The CQ bit was unchecked by commit-bot@chromium.org
Retried try job too often on win_rel for step(s) base_unittests, browser_tests, interactive_ui_tests, net_unittests, unit_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...
The CQ bit was checked by vitalybuka@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/340002
The CQ bit was unchecked by commit-bot@chromium.org
Retried try job too often on win_rel for step(s) unit_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...
The CQ bit was checked by vitalybuka@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/340002
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/340002
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/340002
The CQ bit was unchecked by vitalybuka@chromium.org
The CQ bit was checked by vitalybuka@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/340002
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/340002
Message was sent while issue was closed.
Change committed as 252221
The CQ bit was checked by vitalybuka@chromium.org
The CQ bit was unchecked by vitalybuka@chromium.org
The CQ bit was checked by vitalybuka@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/750001
The CQ bit was unchecked by commit-bot@chromium.org
Retried try job too often on win_x64_rel for step(s) base_unittests, chrome_elf_unittests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
The CQ bit was checked by vitalybuka@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/970001
The CQ bit was unchecked by commit-bot@chromium.org
Retried try job too often on win_rel for step(s) unit_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...
The CQ bit was checked by vitalybuka@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/970001
The CQ bit was unchecked by commit-bot@chromium.org
Retried try job too often on win_rel for step(s) browser_tests, unit_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...
The CQ bit was checked by vitalybuka@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/168003002/970001
Message was sent while issue was closed.
Change committed as 253076 |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
