diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 08:52:30 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 08:52:30 +0000 |
| commit | ae4e03118d9a8792b907c923adf6516495f20536 (patch) | |
| tree | 3ea8d6f01ccc0660998e321025f2dd88b39b1727 /chrome | |
| parent | 35f0e0399ba19fa8ec255510cb8206bf5cc8d177 (diff) | |
| download | chromium_src-ae4e03118d9a8792b907c923adf6516495f20536.zip chromium_src-ae4e03118d9a8792b907c923adf6516495f20536.tar.gz chromium_src-ae4e03118d9a8792b907c923adf6516495f20536.tar.bz2 | |
Change the IME warning to "Your data on all sites"
BUG=chromium-os:24085
TEST=Install an IME extension, check that the right permission is checked
Review URL: https://chromiumcodereview.appspot.com/9179007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
4 files changed, 4 insertions, 7 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 51fecbd..6fcd9c6 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4036,9 +4036,6 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME <message name="IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS" desc="Permission string for access to content settings."> Settings that specify whether websites can use features such as cookies, JavaScript, and plug-ins </message> - <message name="IDS_EXTENSION_PROMPT_WARNING_IME" desc="Permission string for access to ime."> - Anything you type. - </message> <!-- Extension/App error messages --> <message name="IDS_EXTENSION_CANT_GET_ABSOLUTE_PATH" desc="Warning displayed in pack dialog when the absolute path to the extension directory can not be found."> diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc index 107af83..733b3c3 100644 --- a/chrome/common/extensions/extension_permission_set.cc +++ b/chrome/common/extensions/extension_permission_set.cc @@ -242,8 +242,8 @@ void ExtensionAPIPermission::RegisterAllPermissions( kIdle, "idle", 0, ExtensionPermissionMessage::kNone, kFlagNone, kTypeDefault); info->RegisterPermission( - kIme, "ime", IDS_EXTENSION_PROMPT_WARNING_IME, - ExtensionPermissionMessage::kIme, kFlagNone, kTypeDefault); + kIme, "ime", 0, ExtensionPermissionMessage::kNone, + kFlagImpliesFullURLAccess, kTypeDefault); info->RegisterPermission( kInputMethodPrivate, "inputMethodPrivate", 0, ExtensionPermissionMessage::kNone, kFlagCannotBeOptional, kTypeDefault); diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h index 75ccba0..19227fa 100644 --- a/chrome/common/extensions/extension_permission_set.h +++ b/chrome/common/extensions/extension_permission_set.h @@ -48,7 +48,6 @@ class ExtensionPermissionMessage { kTtsEngine, kContentSettings, kAllPageContent, - kIme, kEnumBoundary }; diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc index edd7d05..fdc51eb 100644 --- a/chrome/common/extensions/extension_permission_set_unittest.cc +++ b/chrome/common/extensions/extension_permission_set_unittest.cc @@ -652,8 +652,9 @@ TEST(ExtensionPermissionSetTest, PermissionMessages) { // permissions. skip.insert(ExtensionAPIPermission::kCookie); - // The proxy, and webRequest permissions are warned as part of host + // The ime, proxy, and webRequest permissions are warned as part of host // permission checks. + skip.insert(ExtensionAPIPermission::kIme); skip.insert(ExtensionAPIPermission::kProxy); skip.insert(ExtensionAPIPermission::kWebRequest); skip.insert(ExtensionAPIPermission::kWebRequestBlocking); |