diff options
| author | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 00:45:42 +0000 |
|---|---|---|
| committer | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 00:45:42 +0000 |
| commit | 13e89aaea81b6a1258555cc73d1ab0cf0b04e85e (patch) | |
| tree | bd8ebcb9217f661d5d7169c7eebcd46601702024 /chrome/browser/browser_resources.grd | |
| parent | 08659e74ab9a260da6b855cdd558a642b9eeef18 (diff) | |
| download | chromium_src-13e89aaea81b6a1258555cc73d1ab0cf0b04e85e.zip chromium_src-13e89aaea81b6a1258555cc73d1ab0cf0b04e85e.tar.gz chromium_src-13e89aaea81b6a1258555cc73d1ab0cf0b04e85e.tar.bz2 | |
Remove a duplicate include of about_welcome_android.css
Due to flattenhtml="true" we were including 8 copies of the holo_logo.
BUG=326023
TBR=thestig
Review URL: https://codereview.chromium.org/182213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index d68547e..9cfb896 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -21,7 +21,6 @@ <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> <if expr="is_android"> <structure name="IDR_ABOUT_WELCOME_HTML" file="resources\about_welcome_android\about_welcome_android.html" flattenhtml="true" type="chrome_html" /> - <structure name="IDR_ABOUT_WELCOME_CSS" file="resources\about_welcome_android\about_welcome_android.css" flattenhtml="true" type="chrome_html" /> </if> <if expr="enable_app_list"> <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\start_page.css" flattenhtml="true" type="chrome_html" /> @@ -101,9 +100,7 @@ </if> <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" type="BINDATA" /> <include name="IDR_ABOUT_VERSION_CSS" file="resources\about_version.css" type="BINDATA" /> - <if expr="is_android"> - <include name="IDR_ABOUT_WELCOME_JS" file="resources\about_welcome_android\about_welcome_android.js" type="BINDATA" /> - </if> + <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\manifest.json" type="BINDATA" /> <if expr="enable_enhanced_bookmarks"> <include name="IDR_ENHANCED_BOOKMARKS_MANIFEST" file="resources\enhanced_bookmark_manager\manifest.json" type="BINDATA" /> |