Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1821)

Unified Diff: ui/resources/ui_resources.grd

Issue 7291011: Same as http://codereview.chromium.org/7282021/ after PNG has been added. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/resources/ui_resources.grd
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 95a23ed4ab120523742402aaf84c1401340f32e3..1c3e60a1f85310352586f82d272e9fc224d02a79 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" />
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698