summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_resources.grd
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 01:10:14 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 01:10:14 +0000
commit8ddbaac46292230ca3d8b5647e94d1a5bd4859ae (patch)
tree63d2a0d8e0be89a72b1dd46d83d74090fe29e71c /chrome/browser/browser_resources.grd
parent176c18328ad6e115b7a191e09e09266671f9cac1 (diff)
downloadchromium_src-8ddbaac46292230ca3d8b5647e94d1a5bd4859ae.zip
chromium_src-8ddbaac46292230ca3d8b5647e94d1a5bd4859ae.tar.gz
chromium_src-8ddbaac46292230ca3d8b5647e94d1a5bd4859ae.tar.bz2
Fixes for the Remoting setup flow.
1. Add gaia_login.html and setup_flow_error.html resources. 2. Add SetupFlowErrorStepBase for errors. 3. More flexible message handling. 4. Support for multiple message handlers in ServiceProcessControl. BUG=67218 TEST=Unittests. Review URL: http://codereview.chromium.org/6064006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
-rw-r--r--chrome/browser/browser_resources.grd1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index af317b1..dade7cd 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -67,6 +67,7 @@ without changes to the corresponding grd file. etaa -->
<include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_REMOTING_SETUP_FLOW_HTML" file="remoting\resources\remoting_setup_flow.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_REMOTING_SETUP_DONE_HTML" file="remoting\resources\remoting_setup_done.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_REMOTING_SETUP_ERROR_HTML" file="remoting\resources\remoting_setup_error.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="printing\cloud_print\resources\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="printing\cloud_print\resources\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="printing\cloud_print\resources\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" />