| Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
| diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
| index e9caadcb207adb7bbf5c135681030e5b1073240b..383b1bee33876a7a3437428d571ee04276f2b5bb 100644
|
| --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
| +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
| @@ -752,18 +752,21 @@ void PrintPreviewHandler::HandleGetExtensionPrinters(
|
|
|
| void PrintPreviewHandler::HandleGrantExtensionUsbPrinterAccess(
|
| const base::ListValue* args) {
|
| + std::string provisional_destination_id;
|
| + bool ok = args->GetString(0, &provisional_destination_id);
|
| + DCHECK(ok);
|
| std::string extension_id;
|
| - bool ok = args->GetString(0, &extension_id);
|
| + ok = args->GetString(1, &extension_id);
|
| DCHECK(ok);
|
| int device_id;
|
| - ok = args->GetInteger(1, &device_id);
|
| + ok = args->GetInteger(2, &device_id);
|
| DCHECK(ok);
|
|
|
| EnsureExtensionPrinterHandlerSet();
|
| extension_printer_handler_->StartGrantUsbPrinterAccess(
|
| extension_id, device_id,
|
| base::Bind(&PrintPreviewHandler::OnGotExtensionUsbPrinterInfo,
|
| - base::Unretained(this), extension_id, device_id));
|
| + base::Unretained(this), provisional_destination_id));
|
| }
|
|
|
| void PrintPreviewHandler::HandleGetExtensionPrinterCapabilities(
|
| @@ -1719,17 +1722,19 @@ void PrintPreviewHandler::OnGotPrintersForExtension(
|
| }
|
|
|
| void PrintPreviewHandler::OnGotExtensionUsbPrinterInfo(
|
| - const std::string& extension_id,
|
| - int device_id,
|
| + const std::string& provisional_destination_id,
|
| const base::DictionaryValue& printer_info) {
|
| if (printer_info.empty()) {
|
| - web_ui()->CallJavascriptFunction("failedToGetExtensionUsbPrinterInfo",
|
| - base::StringValue(extension_id),
|
| - base::FundamentalValue(device_id));
|
| + web_ui()->CallJavascriptFunction(
|
| + "failedToResolveProvisionalDestination",
|
| + base::StringValue(provisional_destination_id));
|
| return;
|
| }
|
|
|
| - web_ui()->CallJavascriptFunction("onExtensionUsbPrinterAdded", printer_info);
|
| + web_ui()->CallJavascriptFunction(
|
| + "onProvisionalDestinationResolved",
|
| + base::StringValue(provisional_destination_id),
|
| + printer_info);
|
| }
|
|
|
| void PrintPreviewHandler::OnGotExtensionPrinterCapabilities(
|
|
|