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

Unified Diff: chrome/browser/ui/webui/print_preview/printer_capabilities.cc

Issue 2509983006: Print Preview: Fix handling of printers without capabilities. (Closed)
Patch Set: Created 4 years, 1 month 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 | « chrome/browser/resources/print_preview/data/destination_store.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview/printer_capabilities.cc
diff --git a/chrome/browser/ui/webui/print_preview/printer_capabilities.cc b/chrome/browser/ui/webui/print_preview/printer_capabilities.cc
index 27c95fb8cf3f014f479de1a9c6a5a7c25b5dd945..5279af4efaf21d5924093b6f94bdfb33d6431860 100644
--- a/chrome/browser/ui/webui/print_preview/printer_capabilities.cc
+++ b/chrome/browser/ui/webui/print_preview/printer_capabilities.cc
@@ -95,10 +95,10 @@ std::unique_ptr<base::DictionaryValue> GetSettingsOnBlockingPool(
printer_info->SetString(kSettingPrinterName, printer_name);
printer_info->SetString(kSettingPrinterDescription, printer_description);
- std::unique_ptr<base::DictionaryValue> capabilities =
- GetPrinterCapabilitiesOnBlockingPoolThread(device_name);
- if (capabilities)
- printer_info->Set(kPrinterCapabilities, std::move(capabilities));
+ auto capabilities = GetPrinterCapabilitiesOnBlockingPoolThread(device_name);
+ if (!capabilities)
+ capabilities = base::MakeUnique<base::DictionaryValue>();
+ printer_info->Set(kPrinterCapabilities, std::move(capabilities));
return printer_info;
}
« no previous file with comments | « chrome/browser/resources/print_preview/data/destination_store.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698