summaryrefslogtreecommitdiffstats
path: root/remoting/resources
diff options
context:
space:
mode:
authorkelvinp <kelvinp@chromium.org>2015-09-28 17:22:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-29 00:23:00 +0000
commit956d07a4c8e61b82ba38e5824ddfafa10712b011 (patch)
tree9ede69fc3c91c7246de51ad93545582d92aebdad /remoting/resources
parentc82ba18e50843b4bfecb1238205db4c23b533d91 (diff)
downloadchromium_src-956d07a4c8e61b82ba38e5824ddfafa10712b011.zip
chromium_src-956d07a4c8e61b82ba38e5824ddfafa10712b011.tar.gz
chromium_src-956d07a4c8e61b82ba38e5824ddfafa10712b011.tar.bz2
Return an error if plugin fails to initialize.
From our stats, the pNaCl plugin fails to initialize in 13% of the connection. We suspect this is due to the fact that NaCL is blocked. This CL: 1. Reports an error if the plugin fails to initialize within 150 seconds. This should be enough given the 99.9 percentile of plugin initialization is 141 seconds. This time is so long because it takes time to JIT the plugin on first run. 2. Detects if NaCL is blocked on the user's browser and shows an error message to help our user to enable NaCL. 3. Create an error type to report back to our telemetry service if the plugin fails to initialize. BUG=535016 Review URL: https://codereview.chromium.org/1368023003 Cr-Commit-Position: refs/heads/master@{#351214}
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 38c35fc..59fb1d3 100644
--- a/remoting/resources/remoting_strings.grd
+++ b/remoting/resources/remoting_strings.grd
@@ -453,6 +453,9 @@
<message desc="Error displayed if the client plugin fails to load." name="IDS_ERROR_MISSING_PLUGIN">
Some required components are missing. Please make sure you're running the latest version of Chrome and try again.
</message>
+ <message desc="Error displayed if Native Client is not enabled." name="IDS_ERROR_NACL_DISABLED">
+ Some required components are missing. Please go to chrome://plugins and make sure Native Client is enabled.
+ </message>
<message desc="Message shown if the user is not authorized to perform the requested action." name="IDS_ERROR_NOT_AUTHORIZED">
You do not have permission to perform that action.
</message>