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

Unified Diff: chrome/common/extensions/permissions/chrome_permission_message_rules.cc

Issue 1316013004: Remove "API proposal for chrome.app.window to intercept all keys." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to TOT Created 5 years, 3 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
Index: chrome/common/extensions/permissions/chrome_permission_message_rules.cc
diff --git a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
index 61a0e56a78b49730455cef02ffb92cc98ff57669..e2c0d452c955e6fe0c92337e55a31846e9d5dc50 100644
--- a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
+++ b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
@@ -627,9 +627,6 @@ ChromePermissionMessageRule::GetAllRules() {
{IDS_EXTENSION_PROMPT_WARNING_DOCUMENT_SCAN,
{APIPermission::kDocumentScan},
{}},
- {IDS_EXTENSION_PROMPT_WARNING_INTERCEPT_ALL_KEYS,
- {APIPermission::kInterceptAllKeys},
- {}}, // TODO(treib): This should probably suppress kInput.
{IDS_EXTENSION_PROMPT_WARNING_INPUT, {APIPermission::kInput}, {}},
{IDS_EXTENSION_PROMPT_WARNING_MANAGEMENT,
{APIPermission::kManagement},
@@ -680,6 +677,91 @@ ChromePermissionMessageRule::GetAllRules() {
{IDS_EXTENSION_PROMPT_WARNING_USERS_PRIVATE,
{APIPermission::kUsersPrivate},
{}},
+ // Platform-app permission messages.
+
+ // The permission string for "fileSystem" is only shown when
+ // "write" or "directory" is present. Read-only access is only
+ // granted after the user has been shown a file or directory
+ // chooser dialog and selected a file or directory. Selecting
+ // the file or directory is considered consent to read it.
+ {IDS_EXTENSION_PROMPT_WARNING_FILE_SYSTEM_DIRECTORY,
+ {APIPermission::kFileSystemDirectory},
+ {}},
+
+ // Because warning messages for the "mediaGalleries" permission
+ // vary based on the permissions parameters, no message ID or
+ // message text is specified here. The message ID and text used
+ // will be determined at run-time in the
+ // |MediaGalleriesPermission| class.
+
+ {IDS_EXTENSION_PROMPT_WARNING_AUDIO_AND_VIDEO_CAPTURE,
+ {APIPermission::kAudioCapture, APIPermission::kVideoCapture},
+ {}},
+
+ // Individual message rules taken from
+ // ExtensionsAPIPermissions::GetAllPermissions():
+ {IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE,
+ {APIPermission::kAudioCapture},
+ {}},
+ {IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH_PRIVATE,
+ {APIPermission::kBluetoothPrivate},
+ {}},
+ {IDS_EXTENSION_PROMPT_WARNING_DECLARATIVE_WEB_REQUEST,
+ {APIPermission::kDeclarativeWebRequest},
+ {}},
+ {IDS_EXTENSION_PROMPT_WARNING_SERIAL, {APIPermission::kSerial}, {}},
+ {IDS_EXTENSION_PROMPT_WARNING_NETWORKING_CONFIG,
+ {APIPermission::kNetworkingConfig},
+ {}},
+
+ // Because warning messages for the "socket" permission vary based
+ // on the permissions parameters, no message ID or message text is
+ // specified here. The message ID and text used will be
+ // determined at run-time in the |SocketPermission| class.
+ {IDS_EXTENSION_PROMPT_WARNING_U2F_DEVICES,
+ {APIPermission::kU2fDevices},
+ {}},
+ {IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE,
+ {APIPermission::kVideoCapture},
+ {}},
+ {IDS_EXTENSION_PROMPT_WARNING_VPN, {APIPermission::kVpnProvider}, {}},
+ {IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE,
+ {APIPermission::kWebConnectable},
+ {}},
+
+ // Rules from ManifestPermissions:
+ // BluetoothManifestPermission:
+ {IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH, {APIPermission::kBluetooth}, {}},
+ {IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH_DEVICES,
+ {APIPermission::kBluetoothDevices},
+ {}},
+
+ // SocketsManifestPermission:
+ {IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST,
+ {APIPermission::kSocketAnyHost},
+ {}},
+ {IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE,
+ {APIPermission::kNetworkState},
+ {}},
+
+ // API permission rules:
+ // SettingsOverrideAPIPermission:
+ {new SingleParameterFormatter(
+ IDS_EXTENSION_PROMPT_WARNING_HOME_PAGE_SETTING_OVERRIDE),
+ {APIPermission::kHomepage},
+ {}},
+ {new SingleParameterFormatter(
+ IDS_EXTENSION_PROMPT_WARNING_SEARCH_SETTINGS_OVERRIDE),
+ {APIPermission::kSearchProvider},
+ {}},
+ {new SingleParameterFormatter(
+ IDS_EXTENSION_PROMPT_WARNING_START_PAGE_SETTING_OVERRIDE),
+ {APIPermission::kStartupPages},
+ {}},
+
+ // Other rules:
+ // From ChromeExtensionsClient::FilterHostPermissions():
+ {IDS_EXTENSION_PROMPT_WARNING_FAVICON, {APIPermission::kFavicon}, {}},
};
return std::vector<ChromePermissionMessageRule>(

Powered by Google App Engine
This is Rietveld 408576698