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

Unified Diff: printing/backend/print_backend_win.cc

Issue 9693064: ScopedPrinterInfoSetter on crash prone blocks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
Index: printing/backend/print_backend_win.cc
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index 9e3c98e0bd2e7029abd4e1dab7e21a9cb4844e85..4df7ae747be1b0d9c0168d27d78edb9daf1cb2c4 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -50,8 +50,7 @@ class PrintBackendWin : public PrintBackend {
virtual bool GetPrinterCapsAndDefaults(const std::string& printer_name,
PrinterCapsAndDefaults* printer_info);
- virtual bool GetPrinterDriverInfo(const std::string& printer_name,
- std::string* driver_info);
+ virtual std::string GetPrinterDriverInfo(const std::string& printer_name);
virtual bool IsValidPrinter(const std::string& printer_name);
};
@@ -178,9 +177,8 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
}
// Gets the information about driver for a specific printer.
-bool PrintBackendWin::GetPrinterDriverInfo(const std::string& printer_name,
- std::string* driver_info) {
- DCHECK(driver_info);
+std::string PrintBackendWin::GetPrinterDriverInfo(const std::string& printer_name) {
+ std::string driver_info;
ScopedPrinterHandle printer_handle;
if (!::OpenPrinter(const_cast<LPTSTR>(UTF8ToWide(printer_name).c_str()),
printer_handle.Receive(), NULL)) {
@@ -217,11 +215,11 @@ bool PrintBackendWin::GetPrinterDriverInfo(const std::string& printer_name,
for (size_t i = 0; i < arraysize(info); ++i) {
std::replace(info[i].begin(), info[i].end(), ';', ',');
- driver_info->append(info[i]);
- driver_info->append(";");
+ driver_info.append(info[i]);
+ driver_info.append(";");
}
- return true;
+ return driver_info;
}
bool PrintBackendWin::IsValidPrinter(const std::string& printer_name) {
« printing/backend/print_backend_cups.cc ('K') | « printing/backend/print_backend_cups.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698