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

Side by Side Diff: extensions/browser/api/usb/usb_api.cc

Issue 315573003: Remove PermissionsData::ForExtension() completely (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « extensions/browser/api/socket/socket_api.cc ('k') | extensions/common/extension.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/api/usb/usb_api.h" 5 #include "extensions/browser/api/usb/usb_api.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 bool UsbAsyncApiFunction::Respond() { 415 bool UsbAsyncApiFunction::Respond() {
416 return error_.empty(); 416 return error_.empty();
417 } 417 }
418 418
419 scoped_refptr<UsbDevice> UsbAsyncApiFunction::GetDeviceOrOrCompleteWithError( 419 scoped_refptr<UsbDevice> UsbAsyncApiFunction::GetDeviceOrOrCompleteWithError(
420 const Device& input_device) { 420 const Device& input_device) {
421 const uint16_t vendor_id = input_device.vendor_id; 421 const uint16_t vendor_id = input_device.vendor_id;
422 const uint16_t product_id = input_device.product_id; 422 const uint16_t product_id = input_device.product_id;
423 UsbDevicePermission::CheckParam param( 423 UsbDevicePermission::CheckParam param(
424 vendor_id, product_id, UsbDevicePermissionData::UNSPECIFIED_INTERFACE); 424 vendor_id, product_id, UsbDevicePermissionData::UNSPECIFIED_INTERFACE);
425 if (!PermissionsData::ForExtension(GetExtension()) 425 if (!GetExtension()->permissions_data()->CheckAPIPermissionWithParam(
426 ->CheckAPIPermissionWithParam(APIPermission::kUsbDevice, &param)) { 426 APIPermission::kUsbDevice, &param)) {
427 LOG(WARNING) << "Insufficient permissions to access device."; 427 LOG(WARNING) << "Insufficient permissions to access device.";
428 CompleteWithError(kErrorPermissionDenied); 428 CompleteWithError(kErrorPermissionDenied);
429 return NULL; 429 return NULL;
430 } 430 }
431 431
432 UsbService* service = UsbService::GetInstance(); 432 UsbService* service = UsbService::GetInstance();
433 if (!service) { 433 if (!service) {
434 CompleteWithError(kErrorInitService); 434 CompleteWithError(kErrorInitService);
435 return NULL; 435 return NULL;
436 } 436 }
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 } 546 }
547 547
548 void UsbFindDevicesFunction::AsyncWorkStart() { 548 void UsbFindDevicesFunction::AsyncWorkStart() {
549 scoped_ptr<base::ListValue> result(new base::ListValue()); 549 scoped_ptr<base::ListValue> result(new base::ListValue());
550 const uint16_t vendor_id = parameters_->options.vendor_id; 550 const uint16_t vendor_id = parameters_->options.vendor_id;
551 const uint16_t product_id = parameters_->options.product_id; 551 const uint16_t product_id = parameters_->options.product_id;
552 int interface_id = parameters_->options.interface_id.get() 552 int interface_id = parameters_->options.interface_id.get()
553 ? *parameters_->options.interface_id.get() 553 ? *parameters_->options.interface_id.get()
554 : UsbDevicePermissionData::ANY_INTERFACE; 554 : UsbDevicePermissionData::ANY_INTERFACE;
555 UsbDevicePermission::CheckParam param(vendor_id, product_id, interface_id); 555 UsbDevicePermission::CheckParam param(vendor_id, product_id, interface_id);
556 if (!PermissionsData::ForExtension(GetExtension()) 556 if (!GetExtension()->permissions_data()->CheckAPIPermissionWithParam(
557 ->CheckAPIPermissionWithParam(APIPermission::kUsbDevice, &param)) { 557 APIPermission::kUsbDevice, &param)) {
558 LOG(WARNING) << "Insufficient permissions to access device."; 558 LOG(WARNING) << "Insufficient permissions to access device.";
559 CompleteWithError(kErrorPermissionDenied); 559 CompleteWithError(kErrorPermissionDenied);
560 return; 560 return;
561 } 561 }
562 562
563 UsbService* service = UsbService::GetInstance(); 563 UsbService* service = UsbService::GetInstance();
564 if (!service) { 564 if (!service) {
565 CompleteWithError(kErrorInitService); 565 CompleteWithError(kErrorInitService);
566 return; 566 return;
567 } 567 }
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 return true; 622 return true;
623 } 623 }
624 624
625 void UsbGetDevicesFunction::AsyncWorkStart() { 625 void UsbGetDevicesFunction::AsyncWorkStart() {
626 scoped_ptr<base::ListValue> result(new base::ListValue()); 626 scoped_ptr<base::ListValue> result(new base::ListValue());
627 627
628 const uint16_t vendor_id = parameters_->options.vendor_id; 628 const uint16_t vendor_id = parameters_->options.vendor_id;
629 const uint16_t product_id = parameters_->options.product_id; 629 const uint16_t product_id = parameters_->options.product_id;
630 UsbDevicePermission::CheckParam param( 630 UsbDevicePermission::CheckParam param(
631 vendor_id, product_id, UsbDevicePermissionData::UNSPECIFIED_INTERFACE); 631 vendor_id, product_id, UsbDevicePermissionData::UNSPECIFIED_INTERFACE);
632 if (!PermissionsData::ForExtension(GetExtension()) 632 if (!GetExtension()->permissions_data()->CheckAPIPermissionWithParam(
633 ->CheckAPIPermissionWithParam(APIPermission::kUsbDevice, &param)) { 633 APIPermission::kUsbDevice, &param)) {
634 LOG(WARNING) << "Insufficient permissions to access device."; 634 LOG(WARNING) << "Insufficient permissions to access device.";
635 CompleteWithError(kErrorPermissionDenied); 635 CompleteWithError(kErrorPermissionDenied);
636 return; 636 return;
637 } 637 }
638 638
639 UsbService* service = UsbService::GetInstance(); 639 UsbService* service = UsbService::GetInstance();
640 if (!service) { 640 if (!service) {
641 CompleteWithError(kErrorInitService); 641 CompleteWithError(kErrorInitService);
642 return; 642 return;
643 } 643 }
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 SetResult(new base::FundamentalValue(false)); 1199 SetResult(new base::FundamentalValue(false));
1200 CompleteWithError(kErrorResetDevice); 1200 CompleteWithError(kErrorResetDevice);
1201 return; 1201 return;
1202 } 1202 }
1203 1203
1204 SetResult(new base::FundamentalValue(true)); 1204 SetResult(new base::FundamentalValue(true));
1205 AsyncWorkCompleted(); 1205 AsyncWorkCompleted();
1206 } 1206 }
1207 1207
1208 } // namespace extensions 1208 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/socket/socket_api.cc ('k') | extensions/common/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698