diff options
| author | tommycli <tommycli@chromium.org> | 2016-03-01 16:23:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 00:24:20 +0000 |
| commit | d3f29202a41db90b9657b39158777b58ef81bfdb (patch) | |
| tree | f3cee2c919ea123172c4398c0defb4288fbc9b12 /extensions | |
| parent | 68403dc18553e0420a76cabdc4d6cc88604fea5f (diff) | |
| download | chromium_src-d3f29202a41db90b9657b39158777b58ef81bfdb.zip chromium_src-d3f29202a41db90b9657b39158777b58ef81bfdb.tar.gz chromium_src-d3f29202a41db90b9657b39158777b58ef81bfdb.tar.bz2 | |
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}
Diffstat (limited to 'extensions')
3 files changed, 4 insertions, 7 deletions
diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h index a312c5a..3b9bf6a 100644 --- a/extensions/browser/extension_function_histogram_value.h +++ b/extensions/browser/extension_function_histogram_value.h @@ -721,9 +721,9 @@ enum HistogramValue { DELETED_READINGLISTPRIVATE_ADDENTRY, DELETED_READINGLISTPRIVATE_REMOVEENTRY, DELETED_READINGLISTPRIVATE_GETENTRIES, - MEDIAGALLERIES_STARTMEDIASCAN, - MEDIAGALLERIES_CANCELMEDIASCAN, - MEDIAGALLERIES_ADDSCANRESULTS, + DELETED_MEDIAGALLERIES_STARTMEDIASCAN, + DELETED_MEDIAGALLERIES_CANCELMEDIASCAN, + DELETED_MEDIAGALLERIES_ADDSCANRESULTS, LOGPRIVATE_STARTNETINTERNALSWATCH, LOGPRIVATE_STOPNETINTERNALSWATCH, FILEMANAGERPRIVATE_GETPROFILES, 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<MediaGalleriesPermissionData>::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) { |