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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/app/theme/theme_resources_touch_2x.grd

Issue 10538082: Update use of OTR avatars for touch. We now select (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Aura build, merge to LKGR Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/theme/theme_resources_touch_1x.grd ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/theme_resources_touch_2x.h" type="rc_header"> 4 <output filename="grit/theme_resources_touch_2x.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="theme_resources_touch_2x.pak" type="data_package" /> 7 <output filename="theme_resources_touch_2x.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <includes> 10 <includes>
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 <include name="IDR_NEWTAB_BUTTON" file="default_200_percent/newtab.png" type="BINDATA" /> 147 <include name="IDR_NEWTAB_BUTTON" file="default_200_percent/newtab.png" type="BINDATA" />
148 <include name="IDR_NEWTAB_BUTTON_H" file="default_200_percent/newtab_hov er.png" type="BINDATA" /> 148 <include name="IDR_NEWTAB_BUTTON_H" file="default_200_percent/newtab_hov er.png" type="BINDATA" />
149 <include name="IDR_NEWTAB_BUTTON_P" file="default_200_percent/newtab_pre ssed.png" type="BINDATA" /> 149 <include name="IDR_NEWTAB_BUTTON_P" file="default_200_percent/newtab_pre ssed.png" type="BINDATA" />
150 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_200_percent/newtab_ button_mask.png" type="BINDATA" /> 150 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_200_percent/newtab_ button_mask.png" type="BINDATA" />
151 </if> 151 </if>
152 <include name="IDR_SETTINGS_FAVICON" file="touch_100_percent/settings_favi con.png" type="BINDATA" /> 152 <include name="IDR_SETTINGS_FAVICON" file="touch_100_percent/settings_favi con.png" type="BINDATA" />
153 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="touch_100_percent /ev_bubble_c.png" type="BINDATA" /> 153 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="touch_100_percent /ev_bubble_c.png" type="BINDATA" />
154 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="touch_100_percent /ev_bubble_l.png" type="BINDATA" /> 154 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="touch_100_percent /ev_bubble_l.png" type="BINDATA" />
155 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="touch_100_percent /ev_bubble_r.png" type="BINDATA" /> 155 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="touch_100_percent /ev_bubble_r.png" type="BINDATA" />
156 <include name="IDR_OTR_ICON" file="touch_100_percent/otr_icon.png" type="B INDATA" /> 156 <include name="IDR_OTR_ICON" file="touch_100_percent/otr_icon.png" type="B INDATA" />
157 <include name="IDR_OTR_ICON_FULLSCREEN" file="touch_200_percent/otr_icon_f ullscreen.png" type="BINDATA" />
157 <include name="IDR_PLUGIN" file="touch_100_percent/plugin.png" type="BINDA TA" /> 158 <include name="IDR_PLUGIN" file="touch_100_percent/plugin.png" type="BINDA TA" />
158 <if expr="pp_ifdef('toolkit_views')"> 159 <if expr="pp_ifdef('toolkit_views')">
159 <include name="IDR_RELOAD" file="touch_200_percent/browser_reload_normal .png" type="BINDATA" /> 160 <include name="IDR_RELOAD" file="touch_200_percent/browser_reload_normal .png" type="BINDATA" />
160 <include name="IDR_RELOAD_H" file="touch_200_percent/browser_reload_hove r.png" type="BINDATA" /> 161 <include name="IDR_RELOAD_H" file="touch_200_percent/browser_reload_hove r.png" type="BINDATA" />
161 <include name="IDR_RELOAD_P" file="touch_200_percent/browser_reload_pres sed.png" type="BINDATA" /> 162 <include name="IDR_RELOAD_P" file="touch_200_percent/browser_reload_pres sed.png" type="BINDATA" />
162 </if> 163 </if>
163 <if expr="not pp_ifdef('toolkit_views')"> 164 <if expr="not pp_ifdef('toolkit_views')">
164 <include name="IDR_RELOAD" file="default_200_percent/reload.png" type="B INDATA" /> 165 <include name="IDR_RELOAD" file="default_200_percent/reload.png" type="B INDATA" />
165 <include name="IDR_RELOAD_H" file="default_200_percent/reload_hover.png" type="BINDATA" /> 166 <include name="IDR_RELOAD_H" file="default_200_percent/reload_hover.png" type="BINDATA" />
166 <include name="IDR_RELOAD_P" file="default_200_percent/reload_pressed.pn g" type="BINDATA" /> 167 <include name="IDR_RELOAD_P" file="default_200_percent/reload_pressed.pn g" type="BINDATA" />
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 <if expr="not pp_ifdef('toolkit_views')"> 267 <if expr="not pp_ifdef('toolkit_views')">
267 <include name="IDR_TOOLS" file="default_200_percent/tools.png" type="BIN DATA" /> 268 <include name="IDR_TOOLS" file="default_200_percent/tools.png" type="BIN DATA" />
268 <include name="IDR_TOOLS_H" file="default_200_percent/tools_hover.png" t ype="BINDATA" /> 269 <include name="IDR_TOOLS_H" file="default_200_percent/tools_hover.png" t ype="BINDATA" />
269 <include name="IDR_TOOLS_P" file="default_200_percent/tools_pressed.png" type="BINDATA" /> 270 <include name="IDR_TOOLS_P" file="default_200_percent/tools_pressed.png" type="BINDATA" />
270 </if> 271 </if>
271 <include name="IDR_ZOOM_MINUS" file="touch_200_percent/zoom_minus.png" typ e="BINDATA" /> 272 <include name="IDR_ZOOM_MINUS" file="touch_200_percent/zoom_minus.png" typ e="BINDATA" />
272 <include name="IDR_ZOOM_PLUS" file="touch_200_percent/zoom_plus.png" type= "BINDATA" /> 273 <include name="IDR_ZOOM_PLUS" file="touch_200_percent/zoom_plus.png" type= "BINDATA" />
273 </includes> 274 </includes>
274 </release> 275 </release>
275 </grit> 276 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources_touch_1x.grd ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698