diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-06 22:52:37 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-06 22:52:37 +0000 |
| commit | 3626869f82bee0fa1e9790ab0e2daea4072ed641 (patch) | |
| tree | 6e7007f71dbc3fa1815984d4ac1e10fae69d886c /chrome/browser/browser_resources.grd | |
| parent | b0d4ce950e008072b9159c12de5a2735b6acb427 (diff) | |
| download | chromium_src-3626869f82bee0fa1e9790ab0e2daea4072ed641.zip chromium_src-3626869f82bee0fa1e9790ab0e2daea4072ed641.tar.gz chromium_src-3626869f82bee0fa1e9790ab0e2daea4072ed641.tar.bz2 | |
Activation process and UI improvements:
* Improved reconnection logic after OTASP - we still get number of transient activation failures there that got reported as 'connectivity' error (see http://crosbug.com/9361 for details)
* Added [Close] button to error page.
* Removed ':' from connection error message.
BUG=chromium-os:10335,chromium-os:9361,chromium-os:10282
TEST=make sure close button shows when there is a payment page below error div
Review URL: http://codereview.chromium.org/6250122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 50415f8ee..9748ac0 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -101,13 +101,13 @@ without changes to the corresponding grd file. etaa --> <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOBILE_MANIFEST" file="resources\mobile_app\manifest.json" type="BINDATA" /> <!-- manifest file of ChromeVox accessibility extension --> <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\manifest.json" type="BINDATA" /> </if> <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" /> <include name="IDR_GETSTARTED_MANIFEST" file="resources\getstarted\manifest.json" type="BINDATA" /> - <include name="IDR_MOBILE_MANIFEST" file="resources\mobile_app\manifest.json" type="BINDATA" /> </if> </includes> </release> |