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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/resources/ui_resources.grd

Issue 2273133003: Merge "arc: Update notification close button image" (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « ui/resources/default_200_percent/common/arc_notification_close.png ('k') | no next file » | 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/ui_resources.h" type="rc_header" context="default_100 _percent"> 4 <output filename="grit/ui_resources.h" type="rc_header" context="default_100 _percent">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/ui_resources_map.cc" type="resource_map_source" conte xt="default_100_percent" /> 7 <output filename="grit/ui_resources_map.cc" type="resource_map_source" conte xt="default_100_percent" />
8 <output filename="grit/ui_resources_map.h" type="resource_map_header" contex t="default_100_percent" /> 8 <output filename="grit/ui_resources_map.h" type="resource_map_header" contex t="default_100_percent" />
9 <output filename="ui_resources_100_percent.pak" type="data_package" context= "default_100_percent" /> 9 <output filename="ui_resources_100_percent.pak" type="data_package" context= "default_100_percent" />
10 <output filename="ui_resources_200_percent.pak" type="data_package" context= "default_200_percent" /> 10 <output filename="ui_resources_200_percent.pak" type="data_package" context= "default_200_percent" />
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_P RESSED" file="common/notification_clear_all_pressed.png"/> 145 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_P RESSED" file="common/notification_clear_all_pressed.png"/>
146 <if expr="is_win"> 146 <if expr="is_win">
147 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE" fi le="win/notification_close.png"/> 147 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE" fi le="win/notification_close.png"/>
148 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_HOV ER" file="win/notification_close_hover.png"/> 148 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_HOV ER" file="win/notification_close_hover.png"/>
149 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_PRE SSED" file="win/notification_close_pressed.png"/> 149 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_PRE SSED" file="win/notification_close_pressed.png"/>
150 </if> 150 </if>
151 <if expr="not is_win"> 151 <if expr="not is_win">
152 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE" fi le="common/notification_close.png"/> 152 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE" fi le="common/notification_close.png"/>
153 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_HOV ER" file="common/notification_close_hover.png"/> 153 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_HOV ER" file="common/notification_close_hover.png"/>
154 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_PRE SSED" file="common/notification_close_pressed.png"/> 154 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_PRE SSED" file="common/notification_close_pressed.png"/>
155 <structure type="chrome_scaled_image" name="IDR_ARC_NOTIFICATION_CLOSE " file="common/arc_notification_close.png"/>
155 </if> 156 </if>
156 <if expr="desktop_linux and use_aura"> 157 <if expr="desktop_linux and use_aura">
157 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CL OSE" file="common/notification_bubble_close.png"/> 158 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CL OSE" file="common/notification_bubble_close.png"/>
158 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CL OSE_HOVER" file="common/notification_bubble_close_hover.png"/> 159 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CL OSE_HOVER" file="common/notification_bubble_close_hover.png"/>
159 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CL OSE_PRESSED" file="common/notification_bubble_close_pressed.png"/> 160 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CL OSE_PRESSED" file="common/notification_bubble_close_pressed.png"/>
160 </if> 161 </if>
161 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DO_NOT_DIST URB" file="common/notification_do_not_disturb.png"/> 162 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DO_NOT_DIST URB" file="common/notification_do_not_disturb.png"/>
162 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DO_NOT_DIST URB_HOVER" file="common/notification_do_not_disturb_hover.png"/> 163 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DO_NOT_DIST URB_HOVER" file="common/notification_do_not_disturb_hover.png"/>
163 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DO_NOT_DIST URB_PRESSED" file="common/notification_do_not_disturb_pressed.png"/> 164 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DO_NOT_DIST URB_PRESSED" file="common/notification_do_not_disturb_pressed.png"/>
164 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS" f ile="common/notification_settings.png"/> 165 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS" f ile="common/notification_settings.png"/>
(...skipping 28 matching lines...) Expand all
193 <if expr="toolkit_views"> 194 <if expr="toolkit_views">
194 <structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_COPY" fil e="common/drag_tip_copy.png" /> 195 <structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_COPY" fil e="common/drag_tip_copy.png" />
195 <structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_MOVE" fil e="common/drag_tip_move.png" /> 196 <structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_MOVE" fil e="common/drag_tip_move.png" />
196 <structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_LINK" fil e="common/drag_tip_link.png" /> 197 <structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_LINK" fil e="common/drag_tip_link.png" />
197 <structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_NODROP" f ile="common/drag_tip_nodrop.png" /> 198 <structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_NODROP" f ile="common/drag_tip_nodrop.png" />
198 </if> 199 </if>
199 <structure type="chrome_scaled_image" name="IDR_TRANSLATE_ICON_BUBBLE" fil e="common/translate.png" /> 200 <structure type="chrome_scaled_image" name="IDR_TRANSLATE_ICON_BUBBLE" fil e="common/translate.png" />
200 </structures> 201 </structures>
201 </release> 202 </release>
202 </grit> 203 </grit>
OLDNEW
« no previous file with comments | « ui/resources/default_200_percent/common/arc_notification_close.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698