summaryrefslogtreecommitdiffstats
path: root/remoting/resources
diff options
context:
space:
mode:
authorlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 17:44:04 +0000
committerlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 17:44:04 +0000
commita9b62a20a765d2c36c4f76a72394c8940fe96636 (patch)
treedd948a2959654fffa804aa72c32626c98189e7c1 /remoting/resources
parentaa8101382f9e46bbfefb89cac05b91c715e7175b (diff)
downloadchromium_src-a9b62a20a765d2c36c4f76a72394c8940fe96636.zip
chromium_src-a9b62a20a765d2c36c4f76a72394c8940fe96636.tar.gz
chromium_src-a9b62a20a765d2c36c4f76a72394c8940fe96636.tar.bz2
Change HostController methods to accept onError callbacks.
The HostController methods which took a |callback| parameter now accept an additional |onError| callback. Previously, an AsyncResult was passed to |callback| to indicate success/failure. Instead, |callback| takes no parameters, and |onError| is called on failure, passing in a remoting.Error code. New error-codes have been added to correspond to AsyncResult.CANCELED and AsyncResult.FAILED_DIRECTORY. HostSetupDialog has been modified to use the new interface, and no longer uses HostController.AsyncResult. In particular, HostSetupFlow.switchToNextStep(AsyncResult result) has been split into two methods for the success and failure cases. BUG=249970 TEST=Verify host setup flow under normal and error conditions. R=jamiewalch@chromium.org, sergeyu@chromium.org Review URL: https://codereview.chromium.org/17764004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/resources')
-rw-r--r--remoting/resources/remoting_strings.grd2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd
index 0cfd5cd..2d0c3c6 100644
--- a/remoting/resources/remoting_strings.grd
+++ b/remoting/resources/remoting_strings.grd
@@ -393,7 +393,7 @@
<message desc="Message shown when user has attempted to continue past the manual install dialog, but the Host components are not yet installed." name="IDR_HOST_SETUP_INSTALL_PENDING">
Please run the installer before continuing.
</message>
- <message desc="Message shown when host registration fails when enabling the host on local computer." name="IDR_HOST_SETUP_REGISTRATION_FAILED">
+ <message desc="Message shown when host registration fails when enabling the host on local computer." name="IDR_ERROR_HOST_REGISTRATION_FAILED">
Failed to register this computer.
</message>
<message desc="Message shown after access to local computer has been enabled successfully." name="IDR_HOST_SETUP_STARTED">