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

Unified Diff: chrome/common/extensions/extension.cc

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved conflicts. Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | chrome/common/extensions/extension_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index bd62b97b4f33a2282928b515059eed21e8f2e3d7..00d22a7fa823986ff088110b62497fc22be58b30 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -280,6 +280,7 @@ const char Extension::kGeolocationPermission[] = "geolocation";
const char Extension::kHistoryPermission[] = "history";
const char Extension::kIdlePermission[] = "idle";
const char Extension::kManagementPermission[] = "management";
+const char Extension::kMediaPlayerPrivatePermission[] = "mediaPlayerPrivate";
const char Extension::kNotificationPermission[] = "notifications";
const char Extension::kProxyPermission[] = "proxy";
const char Extension::kTabPermission[] = "tabs";
@@ -309,6 +310,7 @@ const Extension::Permission Extension::kPermissions[] = {
{ kHistoryPermission, PermissionMessage::ID_BROWSING_HISTORY },
{ kIdlePermission, PermissionMessage::ID_NONE },
{ kManagementPermission, PermissionMessage::ID_MANAGEMENT },
+ { kMediaPlayerPrivatePermission, PermissionMessage::ID_NONE },
{ kNotificationPermission, PermissionMessage::ID_NONE },
{ kProxyPermission, PermissionMessage::ID_NONE },
{ kTabPermission, PermissionMessage::ID_TABS },
@@ -334,6 +336,7 @@ const size_t Extension::kNumHostedAppPermissions =
const char* const Extension::kComponentPrivatePermissionNames[] = {
Extension::kFileBrowserPrivatePermission,
Extension::kWebstorePrivatePermission,
+ Extension::kMediaPlayerPrivatePermission,
Extension::kChromeosInfoPrivatePermission,
};
const size_t Extension::kNumComponentPrivatePermissions =
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | chrome/common/extensions/extension_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698