diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-20 00:36:55 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-20 00:36:55 +0000 |
| commit | bdff2897e47fbeb5fe26e369f8788c62d9c7c6d0 (patch) | |
| tree | e7d27958e50ae522e7ea21b22221ac5790f3f47a /chrome/browser/browser_resources.grd | |
| parent | 1d01d411a1d7e2ef29adf072855eb561e4c34cf7 (diff) | |
| download | chromium_src-bdff2897e47fbeb5fe26e369f8788c62d9c7c6d0.zip chromium_src-bdff2897e47fbeb5fe26e369f8788c62d9c7c6d0.tar.gz chromium_src-bdff2897e47fbeb5fe26e369f8788c62d9c7c6d0.tar.bz2 | |
ResourceBundle is loading a wrong resource on Windows for sync
In browser_resources.grd, both IDR_SYNC_SETUP_FLOW_HTML and
IDR_REMOTING_SETUP_FLOW_HTML are point to setup_flow.html although they
are different files in different folders. ResourceBundle gets confused
and always return the later one when asked for IDR_SYNC_SETUP_FLOW_HTML.
This problem only happens on Windows but not Linux.
This patch tries to avoid this problem by renaming remoting files with
a remoting_ prefix.
BUG=52777, 52625
TEST=Setup sync now loads the correct setup_flow.html
Review URL: http://codereview.chromium.org/3191013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 3c277f7..2f34ba7 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -57,8 +57,8 @@ without changes to the corresponding grd file. eadee --> <include name="IDR_SYNC_CHOOSE_DATATYPES_HTML" file="sync\resources\choose_datatypes.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.html" flattenhtml="true" type="BINDATA" /> <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\setup_flow.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_REMOTING_SETUP_DONE_HTML" file="remoting\resources\setup_done.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_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" /> <if expr="pp_ifdef('chromeos')"> |