| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/print_preview/extension_printer_handler.h" | 5 #include "chrome/browser/ui/webui/print_preview/extension_printer_handler.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 extensions::UsbDevicePermission::CheckParam param( | 345 extensions::UsbDevicePermission::CheckParam param( |
| 346 device->vendor_id(), device->product_id(), | 346 device->vendor_id(), device->product_id(), |
| 347 extensions::UsbDevicePermissionData::UNSPECIFIED_INTERFACE); | 347 extensions::UsbDevicePermissionData::UNSPECIFIED_INTERFACE); |
| 348 if (device_permissions->FindUsbDeviceEntry(device) || | 348 if (device_permissions->FindUsbDeviceEntry(device) || |
| 349 extension->permissions_data()->CheckAPIPermissionWithParam( | 349 extension->permissions_data()->CheckAPIPermissionWithParam( |
| 350 extensions::APIPermission::kUsbDevice, ¶m)) { | 350 extensions::APIPermission::kUsbDevice, ¶m)) { |
| 351 // Skip devices the extension already has permission to access. | 351 // Skip devices the extension already has permission to access. |
| 352 continue; | 352 continue; |
| 353 } | 353 } |
| 354 | 354 |
| 355 printer_list.Append(std::move( | 355 printer_list.Append( |
| 356 DictionaryBuilder() | 356 DictionaryBuilder() |
| 357 .Set("id", GenerateProvisionalUsbPrinterId(extension.get(), | 357 .Set("id", GenerateProvisionalUsbPrinterId(extension.get(), |
| 358 device.get())) | 358 device.get())) |
| 359 .Set("name", | 359 .Set("name", |
| 360 DevicePermissionsManager::GetPermissionMessage( | 360 DevicePermissionsManager::GetPermissionMessage( |
| 361 device->vendor_id(), device->product_id(), | 361 device->vendor_id(), device->product_id(), |
| 362 device->manufacturer_string(), | 362 device->manufacturer_string(), |
| 363 device->product_string(), base::string16(), false)) | 363 device->product_string(), base::string16(), false)) |
| 364 .Set("extensionId", extension->id()) | 364 .Set("extensionId", extension->id()) |
| 365 .Set("extensionName", extension->name()) | 365 .Set("extensionName", extension->name()) |
| 366 .Set("provisional", true))); | 366 .Set("provisional", true) |
| 367 .Build()); |
| 367 } | 368 } |
| 368 } | 369 } |
| 369 } | 370 } |
| 370 | 371 |
| 371 DCHECK_GT(pending_enumeration_count_, 0); | 372 DCHECK_GT(pending_enumeration_count_, 0); |
| 372 pending_enumeration_count_--; | 373 pending_enumeration_count_--; |
| 373 callback.Run(*printer_list.Build().get(), pending_enumeration_count_ == 0); | 374 callback.Run(*printer_list.Build().get(), pending_enumeration_count_ == 0); |
| 374 } | 375 } |
| OLD | NEW |