summaryrefslogtreecommitdiffstats
path: root/remoting/resources
diff options
context:
space:
mode:
authorkelvinp <kelvinp@chromium.org>2015-03-04 20:00:11 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-05 04:00:40 +0000
commitf5ac85a3a52b67adfac27fe0ec07d1cf2cff4a84 (patch)
treeb8aa9b3315caaef4494892e9805669d85e42d282 /remoting/resources
parent2053183bb7369afba64ca0a6d52095b5dfa2fc34 (diff)
downloadchromium_src-f5ac85a3a52b67adfac27fe0ec07d1cf2cff4a84.zip
chromium_src-f5ac85a3a52b67adfac27fe0ec07d1cf2cff4a84.tar.gz
chromium_src-f5ac85a3a52b67adfac27fe0ec07d1cf2cff4a84.tar.bz2
Better UI when the machine is shared under a different account
Currently, when the local computer is shared under a different account, we will show the host with an empty name. In this CL, we will show a message saying, 'This computer is currently is shared under a different account' and allows the user to disable the remote connection. We also hide the pairing management or change PIN entry points when this happened. BUG=456291 Review URL: https://codereview.chromium.org/978863002 Cr-Commit-Position: refs/heads/master@{#319213}
Diffstat (limited to 'remoting/resources')
-rw-r--r--remoting/resources/remoting_strings.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd
index d382aee..8419ef9 100644
--- a/remoting/resources/remoting_strings.grd
+++ b/remoting/resources/remoting_strings.grd
@@ -769,6 +769,9 @@ For information about privacy, please see the Google Privacy Policy (http://goo.
<message desc="Button displayed when the current computer is not accepting remote connections. Clicking this button causes it to start accepting remote connections." name="IDS_HOME_DAEMON_START_BUTTON">
Enable remote connections
</message>
+ <message desc="Message displayed in the application to indicate that this computer is remotely accessible, but only from a different account than the one that the user is currently signed in as." name="IDS_HOME_DAEMON_HOST_ENABLED_OTHER_ACCOUNT">
+ This computer is currently shared under a different account.
+ </message>
<message desc="Explanatory text displayed when the user enables remote access or changes the PIN." name="IDS_HOST_SETUP_DIALOG_DESCRIPTION">
To protect access to this computer, please choose a PIN of <ph name="BOLD_START">$1<ex>&lt;b&gt;</ex></ph>at least six digits<ph name="BOLD_END">$2<ex>&lt;/b&gt;</ex></ph>. This PIN will be required when connecting from another location.
</message>