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

Unified Diff: chrome/browser/printing/print_system_task_proxy.cc

Issue 10868097: Return error only if local printer is missing and default caps othervise. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/print_system_task_proxy.cc
diff --git a/chrome/browser/printing/print_system_task_proxy.cc b/chrome/browser/printing/print_system_task_proxy.cc
index 32b15dcd9731552018708c05478ed5a4e1bb0729..2bd9744a98eb23c0ea5b66ed22a43993a5c9c866 100644
--- a/chrome/browser/printing/print_system_task_proxy.cc
+++ b/chrome/browser/printing/print_system_task_proxy.cc
@@ -499,32 +499,37 @@ void PrintSystemTaskProxy::GetPrinterCapabilities(
child_process_logging::ScopedPrinterInfoSetter prn_info(
print_backend_->GetPrinterDriverInfo(printer_name));
+ if (!print_backend_->IsValidPrinter(printer_name)) {
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(&PrintSystemTaskProxy::SendFailedToGetPrinterCapabilities,
+ this, printer_name));
+ return;
+ }
+
bool set_color_as_default = false;
bool set_duplex_as_default = false;
int printer_color_space_for_color = printing::UNKNOWN_COLOR_MODEL;
int printer_color_space_for_black = printing::UNKNOWN_COLOR_MODEL;
int default_duplex_setting_value = printing::UNKNOWN_DUPLEX_MODE;
-
- printing::PrinterCapsAndDefaults printer_info;
- if (!print_backend_->GetPrinterCapsAndDefaults(printer_name,
- &printer_info) ||
- !ParsePrinterCapabilities(printer_info,
- printer_name,
- &set_color_as_default,
- &printer_color_space_for_color,
- &printer_color_space_for_black,
- &set_duplex_as_default,
- &default_duplex_setting_value)) {
- BrowserThread::PostTask(
- BrowserThread::UI, FROM_HERE,
- base::Bind(&PrintSystemTaskProxy::SendFailedToGetPrinterCapabilities,
- this, printer_name));
- return;
+ bool disable_color_options = false;
+
+ printing::PrinterCapsAndDefaults info;
+ if (print_backend_->GetPrinterCapsAndDefaults(printer_name, &info) &&
+ ParsePrinterCapabilities(info,
+ printer_name,
+ &set_color_as_default,
+ &printer_color_space_for_color,
+ &printer_color_space_for_black,
+ &set_duplex_as_default,
+ &default_duplex_setting_value)) {
+ disable_color_options = (!printer_color_space_for_color ||
+ !printer_color_space_for_black ||
+ (printer_color_space_for_color ==
+ printer_color_space_for_black));
+ } else {
+ VLOG(1) << "Failed to get capabilities for " << printer_name;
}
- bool disable_color_options = (!printer_color_space_for_color ||
- !printer_color_space_for_black ||
- (printer_color_space_for_color ==
- printer_color_space_for_black));
DictionaryValue settings_info;
settings_info.SetString(kPrinterId, printer_name);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698