Chromium Code Reviews| 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 85cdf6764524eab50b527c8879809ba61627aa72..972cc8dce6c903e79c0be59959f3153517951459 100644 |
| --- a/chrome/browser/ui/webui/print_preview/printer_capabilities.cc |
| +++ b/chrome/browser/ui/webui/print_preview/printer_capabilities.cc |
| @@ -25,7 +25,8 @@ const char kPrinterCapabilities[] = "capabilities"; |
| namespace { |
| -// Returns a Dictionary representing printer capabilities as CDD. |
| +// Returns a dictionary representing printer capabilities as CDD. Returns |
| +// |nullptr| if a dictionary could not be generated. |
|
Lei Zhang
2016/11/09 21:29:17
nit: nullptr is not the name of a variable.
skau
2016/11/09 21:30:31
Done.
|
| std::unique_ptr<base::DictionaryValue> |
| GetPrinterCapabilitiesOnBlockingPoolThread(const std::string& device_name) { |
| DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); |
| @@ -94,8 +95,11 @@ std::unique_ptr<base::DictionaryValue> GetSettingsOnBlockingPool( |
| printer_info->SetString(kSettingPrinterName, printer_name); |
| printer_info->SetString(kSettingPrinterDescription, printer_description); |
| - printer_info->Set(kPrinterCapabilities, |
| - GetPrinterCapabilitiesOnBlockingPoolThread(device_name)); |
| + std::unique_ptr<base::DictionaryValue> capabilities = |
| + GetPrinterCapabilitiesOnBlockingPoolThread(device_name); |
| + if (capabilities) |
| + printer_info->Set(kPrinterCapabilities, std::move(capabilities)); |
| + |
| return printer_info; |
| } |