From d3f29202a41db90b9657b39158777b58ef81bfdb Mon Sep 17 00:00:00 2001 From: tommycli Date: Tue, 1 Mar 2016 16:23:10 -0800 Subject: Media Galleries Partial Deprecation: Remove scan functionality. Removes ~4100 sloc, and 50k off the binary size. BUG=542912 Review URL: https://codereview.chromium.org/1695563002 Cr-Commit-Position: refs/heads/master@{#378624} --- extensions/common/permissions/media_galleries_permission.cc | 4 +--- extensions/common/permissions/media_galleries_permission_data.cc | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'extensions/common') diff --git a/extensions/common/permissions/media_galleries_permission.cc b/extensions/common/permissions/media_galleries_permission.cc index 6a43268..4ac5ae6 100644 --- a/extensions/common/permissions/media_galleries_permission.cc +++ b/extensions/common/permissions/media_galleries_permission.cc @@ -96,7 +96,6 @@ void AddPermissionsToLists( const char MediaGalleriesPermission::kAllAutoDetectedPermission[] = "allAutoDetected"; -const char MediaGalleriesPermission::kScanPermission[] = "scan"; const char MediaGalleriesPermission::kReadPermission[] = "read"; const char MediaGalleriesPermission::kCopyToPermission[] = "copyTo"; const char MediaGalleriesPermission::kDeletePermission[] = "delete"; @@ -137,8 +136,7 @@ bool MediaGalleriesPermission::FromValue( bool has_delete = false; for (std::set::const_iterator it = data_set_.begin(); it != data_set_.end(); ++it) { - if (it->permission() == kAllAutoDetectedPermission || - it->permission() == kScanPermission) { + if (it->permission() == kAllAutoDetectedPermission) { continue; } if (it->permission() == kReadPermission) { diff --git a/extensions/common/permissions/media_galleries_permission_data.cc b/extensions/common/permissions/media_galleries_permission_data.cc index d7e7937..495c1f9 100644 --- a/extensions/common/permissions/media_galleries_permission_data.cc +++ b/extensions/common/permissions/media_galleries_permission_data.cc @@ -39,7 +39,6 @@ bool MediaGalleriesPermissionData::FromValue(const base::Value* value) { base::TrimWhitespaceASCII(raw_permission, base::TRIM_ALL, &permission); if (permission == MediaGalleriesPermission::kAllAutoDetectedPermission || - permission == MediaGalleriesPermission::kScanPermission || permission == MediaGalleriesPermission::kReadPermission || permission == MediaGalleriesPermission::kCopyToPermission || permission == MediaGalleriesPermission::kDeletePermission) { -- cgit v1.1