diff options
8 files changed, 12 insertions, 24 deletions
diff --git a/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc b/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc index ea6706f..6c87598 100644 --- a/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc +++ b/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc @@ -98,7 +98,7 @@ class MediaGalleriesPreferencesTest : public testing::Test { } std::vector<std::string> all_permissions; - all_permissions.push_back("all-auto-detected"); + all_permissions.push_back("allAutoDetected"); all_permissions.push_back("read"); std::vector<std::string> read_permissions; read_permissions.push_back("read"); diff --git a/chrome/common/extensions/docs/templates/intros/mediaGalleries.html b/chrome/common/extensions/docs/templates/intros/mediaGalleries.html index 82dbb9a..892d9f2 100644 --- a/chrome/common/extensions/docs/templates/intros/mediaGalleries.html +++ b/chrome/common/extensions/docs/templates/intros/mediaGalleries.html @@ -20,7 +20,7 @@ means that no media galleries are accessible until the user grants permission to specific media galleries at runtime using the media gallery configuration dialog. This dialog can be programmatically triggered. Alternatively, -specifying the "all-auto-detected" permission parameter grants access to all +specifying the "allAutoDetected" permission parameter grants access to all auto-detected media galleries on the user's computer. However, this permission displays an install time prompt indicating that the extension will have access to all of the user's media files.</p> @@ -28,14 +28,14 @@ will have access to all of the user's media files.</p> <p>On the access type axis, the "read" permission parameter grants the extension the right to read files. This permission does not trigger an install time permission prompt because the user must still grant access to particular -galleries, either with the "all-auto-detected" permission parameter or at +galleries, either with the "allAutoDetected" permission parameter or at runtime by using the media gallery management dialog. For example:</p> <pre>{ "name": "My extension", ... "permissions": [ - <b>{ "mediaGalleries": ["read", "all-auto-detected"] }</b> + <b>{ "mediaGalleries": ["read", "allAutoDetected"] }</b> ], ... }</pre> diff --git a/chrome/common/extensions/permissions/filesystem_permission.cc b/chrome/common/extensions/permissions/filesystem_permission.cc index f35a1b0..734b647 100644 --- a/chrome/common/extensions/permissions/filesystem_permission.cc +++ b/chrome/common/extensions/permissions/filesystem_permission.cc @@ -20,7 +20,6 @@ namespace { -const char kImplicitReadString[] = "read"; const char kWriteString[] = "write"; const char kInvalidString[] = "invalid"; @@ -53,8 +52,6 @@ FileSystemPermission::PermissionTypes FileSystemPermission::PermissionStringToType(const std::string& str) { if (str == kWriteString) return kWrite; - if (str == kImplicitReadString) - return kImplicitRead; return kNone; } @@ -63,8 +60,6 @@ const char* FileSystemPermission::PermissionTypeToString(PermissionTypes type) { switch (type) { case kWrite: return kWriteString; - case kImplicitRead: - return kImplicitReadString; default: NOTREACHED(); return kInvalidString; @@ -117,10 +112,6 @@ bool FileSystemPermission::Equal(const APIPermission* rhs) const { bool FileSystemPermission::FromValue(const base::Value* value) { permissions_.clear(); - // Always configure with the implicit read string. This may also be specified - // in the manifest, but is redundant. - permissions_.insert(kImplicitRead); - // The simple "fileSystem" form, without an argument, is allowed. if (!value) return true; @@ -180,7 +171,7 @@ APIPermission* FileSystemPermission::Union(const APIPermission* rhs) const { perm->permissions_.begin(), perm->permissions_.end(), std::inserter<std::set<PermissionTypes> >( result->permissions_, result->permissions_.begin())); - return result->permissions_.empty() ? NULL : result.release(); + return result.release(); } APIPermission* FileSystemPermission::Intersect( @@ -194,7 +185,7 @@ APIPermission* FileSystemPermission::Intersect( std::inserter<std::set<PermissionTypes> >( result->permissions_, result->permissions_.begin())); - return result->permissions_.empty() ? NULL : result.release(); + return result.release(); } void FileSystemPermission::Write(IPC::Message* m) const { diff --git a/chrome/common/extensions/permissions/filesystem_permission.h b/chrome/common/extensions/permissions/filesystem_permission.h index ebef866..62f21de 100644 --- a/chrome/common/extensions/permissions/filesystem_permission.h +++ b/chrome/common/extensions/permissions/filesystem_permission.h @@ -18,17 +18,14 @@ class Extension; // The default filesystem permission (no permission parameter) grants read // access to files based on user action, i.e., through a file chooser. -// Specifically, the "read" permission may be specified in a manifest, but -// is always implicitly added here. // <filesystem permissions> -// := 'write' | 'read' | <filesystem permissions> +// := 'write' | <filesystem permissions> class FileSystemPermission : public APIPermission { public: enum PermissionTypes { kNone = 0, - kImplicitRead, kWrite, }; diff --git a/chrome/common/extensions/permissions/media_galleries_permission.cc b/chrome/common/extensions/permissions/media_galleries_permission.cc index a622424..35ced89 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission.cc +++ b/chrome/common/extensions/permissions/media_galleries_permission.cc @@ -20,7 +20,7 @@ namespace { -const char kAllAutoDetectedString[] = "all-auto-detected"; +const char kAllAutoDetectedString[] = "allAutoDetected"; const char kReadString[] = "read"; const char kInvalidString[] = "invalid"; diff --git a/chrome/common/extensions/permissions/media_galleries_permission.h b/chrome/common/extensions/permissions/media_galleries_permission.h index 2629fc7..c575d5f 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission.h +++ b/chrome/common/extensions/permissions/media_galleries_permission.h @@ -29,7 +29,7 @@ class Extension; // // The default location permission (no permission parameter) does not grant // access to any galleries, but lets the user grant access on a per gallery -// basis. The other location permission "all-auto-detected" gives the user +// basis. The other location permission "allAutoDetected" gives the user // access to all auto detected galleries. This includes per platform default // galleries and removable devices that are detected as media devices. // @@ -38,7 +38,7 @@ class Extension; // "write," "delete," and "add-file." // // <media galleries permissions> -// := 'all-auto-detected' | 'read' | <media galleries permissions> +// := 'allAutoDetected' | 'read' | <media galleries permissions> class MediaGalleriesPermission : public APIPermission { public: diff --git a/chrome/test/data/extensions/api_test/media_galleries/no_access/manifest.json b/chrome/test/data/extensions/api_test/media_galleries/no_access/manifest.json index d6e1fc5..3312307 100644 --- a/chrome/test/data/extensions/api_test/media_galleries/no_access/manifest.json +++ b/chrome/test/data/extensions/api_test/media_galleries/no_access/manifest.json @@ -7,5 +7,5 @@ "scripts": ["test.js"] } }, - "permissions": [{"mediaGalleries": ["all-auto-detected"]}] + "permissions": [{"mediaGalleries": ["allAutoDetected"]}] } diff --git a/chrome/test/data/extensions/api_test/media_galleries/read_access/manifest.json b/chrome/test/data/extensions/api_test/media_galleries/read_access/manifest.json index afbb5f9..fdad16f 100644 --- a/chrome/test/data/extensions/api_test/media_galleries/read_access/manifest.json +++ b/chrome/test/data/extensions/api_test/media_galleries/read_access/manifest.json @@ -7,5 +7,5 @@ "scripts": ["test.js"] } }, - "permissions": [{"mediaGalleries": ["read", "all-auto-detected"]}] + "permissions": [{"mediaGalleries": ["read", "allAutoDetected"]}] } |