Skip to content

GitLab

T
tangled
Commit c718ad86 authored by reillyg's avatar reillyg Committed by Commit bot
Browse files
Options

Replace "computer" with "device" in permission warning strings. 

Make these extension permission warning strings "Internet of Things"
friendly be replacing the word "computer" with "device."

Review URL: https://codereview.chromium.org/1063313002

Cr-Commit-Position: refs/heads/master@{#324304}
parent 4cb782b0
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
chrome/browser/extensions/permission_message_combinations_unittest.cc
View file @ c718ad86
......@@ -545,7 +545,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
CreateAndInstall(
"{"
......@@ -559,7 +559,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
CreateAndInstall(
"{"
......@@ -573,7 +573,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with the computer named 127.0.0.1"));
"Exchange data with the device named 127.0.0.1"));
CreateAndInstall(
"{"
......@@ -587,7 +587,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with the computer named www.example.com"));
"Exchange data with the device named www.example.com"));
CreateAndInstall(
"{"
......@@ -601,7 +601,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with the computer named 127.0.0.1"));
"Exchange data with the device named 127.0.0.1"));
CreateAndInstall(
"{"
......@@ -615,7 +615,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
CreateAndInstall(
"{"
......@@ -637,7 +637,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with the computers named: 127.0.0.1 www.bar.com "
"Exchange data with the devices named: 127.0.0.1 www.bar.com "
"www.example.com www.foo.com www.google.com"));
CreateAndInstall(
......@@ -668,7 +668,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with the computers named: 127.0.0.1 www.abc.com "
"Exchange data with the devices named: 127.0.0.1 www.abc.com "
"www.example.com www.foo.com www.freestuff.com www.google.com "
"www.mywebsite.com www.test.com"));
......@@ -685,7 +685,7 @@ TEST_F(PermissionMessageCombinationsUnittest,
" }"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
}
// Check that permission messages are generated correctly for
......@@ -788,7 +788,7 @@ TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
" ]"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
CreateAndInstall(
"{"
......@@ -806,7 +806,7 @@ TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
" ]"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
CreateAndInstall(
"{"
......@@ -820,7 +820,7 @@ TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
" ]"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with the computer named foo.example.com"));
"Exchange data with the device named foo.example.com"));
CreateAndInstall(
"{"
......@@ -834,7 +834,7 @@ TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
" ]"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
CreateAndInstall(
"{"
......@@ -851,7 +851,7 @@ TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
" ]"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with the computers named: foo.example.com test.ping.com"));
"Exchange data with the devices named: foo.example.com test.ping.com"));
CreateAndInstall(
"{"
......@@ -871,7 +871,7 @@ TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
" ]"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with the computers named: foo.example.com test.ping.com "
"Exchange data with the devices named: foo.example.com test.ping.com "
"test2.ping.com www.ping.com"));
CreateAndInstall(
......@@ -890,7 +890,7 @@ TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
" ]"
"}");
ASSERT_TRUE(CheckManifestProducesPermissions(
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
}
// Check that permission messages are generated correctly for
......
chrome/common/extensions/permissions/permission_set_unittest.cc
View file @ c718ad86
......@@ -1270,7 +1270,7 @@ TEST(PermissionsTest, GetWarningMessages_Socket_AnyHost) {
extension->permissions_data()->HasAPIPermission(APIPermission::kSocket));
EXPECT_TRUE(VerifyOnePermissionMessage(
extension->permissions_data(),
"Exchange data with any computer on the local network or internet"));
"Exchange data with any device on the local network or internet"));
}
TEST(PermissionsTest, GetWarningMessages_Socket_OneDomainTwoHostnames) {
......@@ -1288,8 +1288,8 @@ TEST(PermissionsTest, GetWarningMessages_Socket_OneDomainTwoHostnames) {
// order in the manifest file.
EXPECT_TRUE(VerifyTwoPermissionMessages(
extension->permissions_data(),
"Exchange data with any computer in the domain example.org",
"Exchange data with the computers named: "
"Exchange data with any device in the domain example.org",
"Exchange data with the devices named: "
"b\xC3\xA5r.example.com foo.example.com",
// "\xC3\xA5" = UTF-8 for lowercase A with ring above
true));
......@@ -1309,9 +1309,9 @@ TEST(PermissionsTest, GetWarningMessages_Socket_TwoDomainsOneHostname) {
// in alphabetical order regardless of the order in the manifest file.
EXPECT_TRUE(VerifyTwoPermissionMessages(
extension->permissions_data(),
"Exchange data with any computer in the domains: "
"Exchange data with any device in the domains: "
"example.com foo.example.org",
"Exchange data with the computer named bar.example.org", true));
"Exchange data with the device named bar.example.org", true));
}
// Since platform apps always use isolated storage, they can't (silently)
......
extensions/extensions_strings.grd
View file @ c718ad86
......@@ -321,20 +321,20 @@
<message name="IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE" desc="Permission string for network list access.">
Access list of network connections
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST" desc="Permission string for access to any computer on the local network or internet.">
Exchange data with any computer on the local network or internet
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST" desc="Permission string for access to any device on the local network or internet.">
Exchange data with any device on the local network or internet
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN" desc="Permission string for access to any computer within a single domains on the local network or internet.">
Exchange data with any computer in the domain <ph name="DOMAIN">$1<ex>example.com</ex></ph>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN" desc="Permission string for access to any device within a single domains on the local network or internet.">
Exchange data with any device in the domain <ph name="DOMAIN">$1<ex>example.com</ex></ph>
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS" desc="Permission string for access to any computer within multiple domains on the local network or internet.">
Exchange data with any computer in the domains: <ph name="DOMAINS">$1<ex>example.com example.org</ex></ph>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS" desc="Permission string for access to any device within multiple domains on the local network or internet.">
Exchange data with any device in the domains: <ph name="DOMAINS">$1<ex>example.com example.org</ex></ph>
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST" desc="Permission string for access to a single specific computers on the local network or internet.">
Exchange data with the computer named <ph name="HOSTNAME">$1<ex>foo.example.com</ex></ph>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST" desc="Permission string for access to a single specific device on the local network or internet.">
Exchange data with the device named <ph name="HOSTNAME">$1<ex>foo.example.com</ex></ph>
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS" desc="Permission string for access to multiple specific computers on the local network or internet.">
Exchange data with the computers named: <ph name="HOSTNAMES">$1<ex>foo.example.com bar.example.com</ex></ph>
<message name="IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS" desc="Permission string for access to multiple specific devices on the local network or internet.">
Exchange data with the devices named: <ph name="HOSTNAMES">$1<ex>foo.example.com bar.example.com</ex></ph>
</message>
<!-- Device API strings. Please keep alphabetized. -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment