summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 09:06:52 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 09:06:52 +0000
commit1936c94ed66ffd5ceeec73077a14897da21139b5 (patch)
tree6ef2822165019b5461bc6120f5f10f48c5395133
parentbe184df40685be4b86b20c6f6ea1cd04a59f18f1 (diff)
downloadchromium_src-1936c94ed66ffd5ceeec73077a14897da21139b5.zip
chromium_src-1936c94ed66ffd5ceeec73077a14897da21139b5.tar.gz
chromium_src-1936c94ed66ffd5ceeec73077a14897da21139b5.tar.bz2
Add new warning text for input.ime api
BUG=None Review URL: https://chromiumcodereview.appspot.com/10512004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140727 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/common/extensions/extension_permission_set.cc4
-rw-r--r--chrome/common/extensions/extension_permission_set.h1
-rw-r--r--chrome/common/extensions/extension_permission_set_unittest.cc1
4 files changed, 6 insertions, 3 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 57e1f67..db5dfc7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4291,6 +4291,9 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME
<message name="IDS_EXTENSION_PROMPT_WARNING_4_OR_MORE_HOSTS" desc="Permission string for access to data on four or more websites.">
Access your data on <ph name="WEBSITE_1">$1<ex>www.google.com</ex></ph>, <ph name="WEBSITE_2">$2<ex>www.yahoo.com</ex></ph>, and <ph name="NUMBER_OF_OTHER_WEBSITES">$3<ex>3</ex></ph> other websites
</message>
+ <message name="IDS_EXTENSION_PROMPT_WARNING_INPUT" desc="Permission string for access to input.">
+ Access anything you type.
+ </message>
<message name="IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS" desc="Permission string for access to bookmarks.">
Read and modify your bookmarks
</message>
diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc
index c6b72f5..85f2a83 100644
--- a/chrome/common/extensions/extension_permission_set.cc
+++ b/chrome/common/extensions/extension_permission_set.cc
@@ -250,8 +250,8 @@ void ExtensionAPIPermission::RegisterAllPermissions(
info->RegisterPermission(
kIdle, "idle", 0, ExtensionPermissionMessage::kNone, kFlagNone);
info->RegisterPermission(
- kInput, "input", 0, ExtensionPermissionMessage::kNone,
- kFlagImpliesFullURLAccess);
+ kInput, "input", IDS_EXTENSION_PROMPT_WARNING_INPUT,
+ ExtensionPermissionMessage::kInput, kFlagNone);
info->RegisterPermission(
kManagement, "management", IDS_EXTENSION_PROMPT_WARNING_MANAGEMENT,
ExtensionPermissionMessage::kManagement, kFlagNone);
diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h
index d633e5e..d8be820 100644
--- a/chrome/common/extensions/extension_permission_set.h
+++ b/chrome/common/extensions/extension_permission_set.h
@@ -54,6 +54,7 @@ class ExtensionPermissionMessage {
kAllPageContent,
kPrivacy,
kManagedMode,
+ kInput,
kEnumBoundary
};
diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc
index 4f8783f..6b560ee 100644
--- a/chrome/common/extensions/extension_permission_set_unittest.cc
+++ b/chrome/common/extensions/extension_permission_set_unittest.cc
@@ -583,7 +583,6 @@ TEST(ExtensionPermissionsTest, PermissionMessages) {
// The ime, proxy, and webRequest permissions are warned as part of host
// permission checks.
- skip.insert(ExtensionAPIPermission::kInput);
skip.insert(ExtensionAPIPermission::kProxy);
skip.insert(ExtensionAPIPermission::kWebRequest);
skip.insert(ExtensionAPIPermission::kWebRequestBlocking);