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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 512583002: [Local NTP] Implement style updates for Material Design (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small comment fix. Created 6 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/ntp_default_favicon.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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 <if expr="desktop_linux"> 156 <if expr="desktop_linux">
157 <structure type="chrome_scaled_image" name="IDR_CLOSE" file="linux/linux _close.png" /> 157 <structure type="chrome_scaled_image" name="IDR_CLOSE" file="linux/linux _close.png" />
158 </if> 158 </if>
159 <if expr="not desktop_linux and toolkit_views"> 159 <if expr="not desktop_linux and toolkit_views">
160 <structure type="chrome_scaled_image" name="IDR_CLOSE" file="close.png" /> 160 <structure type="chrome_scaled_image" name="IDR_CLOSE" file="close.png" />
161 </if> 161 </if>
162 <structure type="chrome_scaled_image" name="IDR_CLOSE_2" file="close_2.png " /> 162 <structure type="chrome_scaled_image" name="IDR_CLOSE_2" file="close_2.png " />
163 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_H" file="close_2_h over.png" /> 163 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_H" file="close_2_h over.png" />
164 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_MASK" file="close_ 2_mask.png" /> 164 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_MASK" file="close_ 2_mask.png" />
165 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_P" file="close_2_p ressed.png" /> 165 <structure type="chrome_scaled_image" name="IDR_CLOSE_2_P" file="close_2_p ressed.png" />
166 <structure type="chrome_scaled_image" name="IDR_CLOSE_3_MASK" file="common /close_3_mask.png" />
166 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG" file="close_ dialog.png" /> 167 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG" file="close_ dialog.png" />
167 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_H" file="clos e_dialog_hover.png" /> 168 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_H" file="clos e_dialog_hover.png" />
168 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_P" file="clos e_dialog_pressed.png" /> 169 <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_P" file="clos e_dialog_pressed.png" />
169 <if expr="desktop_linux"> 170 <if expr="desktop_linux">
170 <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="linux/lin ux_close_hover.png" /> 171 <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="linux/lin ux_close_hover.png" />
171 <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="linux/lin ux_close_pressed.png" /> 172 <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="linux/lin ux_close_pressed.png" />
172 </if> 173 </if>
173 <if expr="not desktop_linux and toolkit_views"> 174 <if expr="not desktop_linux and toolkit_views">
174 <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="close_hov er.png" /> 175 <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="close_hov er.png" />
175 <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="close_pre ssed.png" /> 176 <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="close_pre ssed.png" />
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DO_NOT_DIST URB_PRESSED" file="common/notification_do_not_disturb_pressed.png"/> 349 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DO_NOT_DIST URB_PRESSED" file="common/notification_do_not_disturb_pressed.png"/>
349 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS" f ile="common/notification_settings.png"/> 350 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS" f ile="common/notification_settings.png"/>
350 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS_HO VER" file="common/notification_settings_hover.png"/> 351 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS_HO VER" file="common/notification_settings_hover.png"/>
351 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS_PR ESSED" file="common/notification_settings_pressed.png"/> 352 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS_PR ESSED" file="common/notification_settings_pressed.png"/>
352 </if> 353 </if>
353 <!-- TODO(calamity): The 1x local ntp resources require a proper version. 354 <!-- TODO(calamity): The 1x local ntp resources require a proper version.
354 See crbug.com/363519. --> 355 See crbug.com/363519. -->
355 <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_LOGO_PNG" file="common/ntp_google_logo.png" /> 356 <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_LOGO_PNG" file="common/ntp_google_logo.png" />
356 <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_WHITE_LOG O_PNG" file="common/ntp_white_google_logo.png" /> 357 <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_WHITE_LOG O_PNG" file="common/ntp_white_google_logo.png" />
357 <if expr="not is_android and not is_ios"> 358 <if expr="not is_android and not is_ios">
359 <structure type="chrome_scaled_image" name="IDR_NTP_DEFAULT_FAVICON" fil e="common/ntp_default_favicon.png" />
360 </if>
361 <if expr="not is_android and not is_ios">
358 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_H OVER" file="cros/action_box_button_hover.png" /> 362 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_H OVER" file="cros/action_box_button_hover.png" />
359 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_N ORMAL" file="cros/action_box_button_normal.png" /> 363 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_N ORMAL" file="cros/action_box_button_normal.png" />
360 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_P RESSED" file="cros/action_box_button_pressed.png" /> 364 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_P RESSED" file="cros/action_box_button_pressed.png" />
361 </if> 365 </if>
362 <if expr="toolkit_views"> 366 <if expr="toolkit_views">
363 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_LEFT_CORNER" f ile="panel_top_left_corner.png" /> 367 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_LEFT_CORNER" f ile="panel_top_left_corner.png" />
364 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_RIGHT_CORNER" file="panel_top_right_corner.png" /> 368 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_RIGHT_CORNER" file="panel_top_right_corner.png" />
365 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_LEFT_CORNER " file="panel_bottom_left_corner.png" /> 369 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_LEFT_CORNER " file="panel_bottom_left_corner.png" />
366 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_RIGHT_CORNE R" file="panel_bottom_right_corner.png" /> 370 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_RIGHT_CORNE R" file="panel_bottom_right_corner.png" />
367 </if> 371 </if>
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_LEFT" file="common/window_bubble_shadow_small_top_left.png" /> 562 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_LEFT" file="common/window_bubble_shadow_small_top_left.png" />
559 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_RIGHT" file="common/window_bubble_shadow_small_top_right.png" /> 563 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_RIGHT" file="common/window_bubble_shadow_small_top_right.png" />
560 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_BOTTOM" file="common/window_bubble_shadow_spike_small_bottom.png" /> 564 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_BOTTOM" file="common/window_bubble_shadow_spike_small_bottom.png" />
561 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_LEFT" file="common/window_bubble_shadow_spike_small_left.png" /> 565 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_LEFT" file="common/window_bubble_shadow_spike_small_left.png" />
562 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_RIGHT" file="common/window_bubble_shadow_spike_small_right.png" /> 566 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_RIGHT" file="common/window_bubble_shadow_spike_small_right.png" />
563 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_TOP" file="common/window_bubble_shadow_spike_small_top.png" /> 567 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_TOP" file="common/window_bubble_shadow_spike_small_top.png" />
564 </if> 568 </if>
565 </structures> 569 </structures>
566 </release> 570 </release>
567 </grit> 571 </grit>
OLDNEW
« no previous file with comments | « ui/resources/default_200_percent/common/ntp_default_favicon.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698