diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 21:37:56 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 21:37:56 +0000 |
| commit | c96be6452c0d5b9fa083fd199a71f12d2bbcc88b (patch) | |
| tree | 81a17ba8e66c323c6d00dae94d1af7fd049d13c6 /ui | |
| parent | c083334f92b03af1e247025d18efb2cd7aa2d24d (diff) | |
| download | chromium_src-c96be6452c0d5b9fa083fd199a71f12d2bbcc88b.zip chromium_src-c96be6452c0d5b9fa083fd199a71f12d2bbcc88b.tar.gz chromium_src-c96be6452c0d5b9fa083fd199a71f12d2bbcc88b.tar.bz2 | |
Same as http://codereview.chromium.org/7282021/ after PNG has been added.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7291011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/resources/ui_resources.grd | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 95a23ed4..1c3e60a 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -28,7 +28,12 @@ <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" /> - <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> + <if expr="not pp_ifdef('touchui')"> + <include name="IDR_DEFAULT_FAVICON" file="default_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_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" /> |