summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 22:43:59 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 22:43:59 +0000
commitd9959986264ae4175895781d834d0ff4413b5436 (patch)
tree9fd0d751eef1215293be573f64027ef2fed82768 /chrome/app
parent03f92bb25184f13f4af0a88d0953ed482a64ea21 (diff)
downloadchromium_src-d9959986264ae4175895781d834d0ff4413b5436.zip
chromium_src-d9959986264ae4175895781d834d0ff4413b5436.tar.gz
chromium_src-d9959986264ae4175895781d834d0ff4413b5436.tar.bz2
Cleanup about:flags for remoting and enable for all platforms.
BUG=none TEST=compiled and viewed under linux. Review URL: http://codereview.chromium.org/6222004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd7
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e4b6880..aec5919 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3961,11 +3961,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_REMOTING_NAME" desc="Description of the 'Remoting' lab.">
Remoting
</message>
- <message name="IDS_FLAGS_REMOTING_CLIENT_DESCRIPTION" desc="Description of the 'Remoting' client lab.">
- Enable Remoting Client support.
- </message>
- <message name="IDS_FLAGS_REMOTING_HOST_DESCRIPTION" desc="Description of the 'Remoting' host lab.">
- Enable Remoting Host support.
+ <message name="IDS_FLAGS_REMOTING_DESCRIPTION" desc="Description of the 'Remoting' client lab.">
+ Enable the UI plus backing code for the Remoting serivce process, and client plugin. Warning: This is currently for developer testing only. Unless you are on the dev team and whitelisted, nothing in the enabled UI will work.
</message>
<message name="IDS_FLAGS_ENABLE_NACL_NAME" desc="Description of the 'Enable Native Client' lab.">
Native Client