diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 21:41:01 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 21:41:01 +0000 |
| commit | 2cc6a929e97b99af96696983549c3cf0e18e9ba5 (patch) | |
| tree | 6a6a8022cc85161b67f326a4e0ebb8f1d9311ba2 /ui | |
| parent | ab5242d0485b8121429938c6d5aadfba4647d81f (diff) | |
| download | chromium_src-2cc6a929e97b99af96696983549c3cf0e18e9ba5.zip chromium_src-2cc6a929e97b99af96696983549c3cf0e18e9ba5.tar.gz chromium_src-2cc6a929e97b99af96696983549c3cf0e18e9ba5.tar.bz2 | |
Change the default favicon to 16x16, except for tabstrip (32x32), for touchui builds.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8251001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/resources/ui_resources.grd | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index b002807..fec1ec9 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -29,13 +29,8 @@ <include name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" type="BINDATA" /> <include name="IDR_CONTENT_LEFT_SIDE" file="content_left_side.png" type="BINDATA" /> <include name="IDR_CONTENT_RIGHT_SIDE" file="content_right_side.png" type="BINDATA" /> - <if expr="not pp_ifdef('touchui')"> - <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> - <include name="IDR_DEFAULT_LARGE_FAVICON" file="default_large_favicon.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('touchui')"> - <include name="IDR_DEFAULT_FAVICON" file="default_large_favicon.png" type="BINDATA" /> - </if> + <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> + <include name="IDR_DEFAULT_LARGE_FAVICON" file="default_large_favicon.png" type="BINDATA" /> <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" /> <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> |