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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/resources/ash_resources.grd

Issue 2680113002: [ash-md] Remove non-md code from the Shelf background animations. (Closed)
Patch Set: Merge branch 'master' into colorize_shelf_1_remove_non_md_code Created 3 years, 10 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 | « ash/common/wm/dock/docked_window_layout_manager.cc ('k') | ash/resources/default_100_percent/common/shelf/shelf_background.png » ('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" output_all_resource_defines= "false"> 2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
3 <outputs> 3 <outputs>
4 <output filename="grit/ash_resources.h" type="rc_header" context="default_10 0_percent"> 4 <output filename="grit/ash_resources.h" type="rc_header" context="default_10 0_percent">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="ash_resources_100_percent.pak" type="data_package" context ="default_100_percent" /> 7 <output filename="ash_resources_100_percent.pak" type="data_package" context ="default_100_percent" />
8 <output filename="ash_resources_200_percent.pak" type="data_package" context ="default_200_percent" /> 8 <output filename="ash_resources_200_percent.pak" type="data_package" context ="default_200_percent" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
11 <structures fallback_to_low_resolution="true"> 11 <structures fallback_to_low_resolution="true">
12 <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST 12 <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
13 BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE 13 BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
14 SAME CONDITIONALS. --> 14 SAME CONDITIONALS. -->
15 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_BACKGROUND" file ="common/shelf/shelf_background.png" />
16 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_CORNER" file="co mmon/shelf/shelf_corner.png" />
17 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_APPLIST" fi le="common/shelf/status_launcher_menu_icon.png" /> 15 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_APPLIST" fi le="common/shelf/status_launcher_menu_icon.png" />
18 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_LIST_BROWSER" fi le="common/shelf/window_switcher_icon_normal.png" /> 16 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_LIST_BROWSER" fi le="common/shelf/window_switcher_icon_normal.png" />
19 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_LIST_INCOGNITO_B ROWSER" file="common/shelf/window_switcher_icon_incognito.png" /> 17 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_LIST_INCOGNITO_B ROWSER" file="common/shelf/window_switcher_icon_incognito.png" />
20 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_OVERFLOW" file=" common/shelf/shelf_overflow.png" /> 18 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_OVERFLOW" file=" common/shelf/shelf_overflow.png" />
21 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_ACTIVE " file="common/shelf/shelf_underline_active.png" /> 19 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_ACTIVE " file="common/shelf/shelf_underline_active.png" />
22 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_ATTENT ION" file="common/shelf/shelf_underline_attention.png" /> 20 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_ATTENT ION" file="common/shelf/shelf_underline_attention.png" />
23 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_RUNNIN G" file="common/shelf/shelf_underline_running.png" /> 21 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_RUNNIN G" file="common/shelf/shelf_underline_running.png" />
24 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_SETTINGS" f ile="common/shelf/settings_app_icon.png" /> 22 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_SETTINGS" f ile="common/shelf/settings_app_icon.png" />
25 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_MD_SETTINGS " file="common/shelf/md_settings_app_icon.png" /> 23 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_MD_SETTINGS " file="common/shelf/md_settings_app_icon.png" />
26 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_TASK_MANAGE R" file="common/shelf/task_manager.png" /> 24 <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_TASK_MANAGE R" file="common/shelf/task_manager.png" />
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_BOTTOM" file="common/window_header_shade_bottom_inactive.png" /> 196 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_BOTTOM" file="common/window_header_shade_bottom_inactive.png" />
199 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_LEFT" file="common/window_header_shade_left_inactive.png" /> 197 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_LEFT" file="common/window_header_shade_left_inactive.png" />
200 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_RIGHT" file="common/window_header_shade_right_inactive.png" /> 198 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_RIGHT" file="common/window_header_shade_right_inactive.png" />
201 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_TOP" file="common/window_header_shade_top_inactive.png" /> 199 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_TOP" file="common/window_header_shade_top_inactive.png" />
202 200
203 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" /> 201 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" />
204 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" /> 202 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" />
205 </structures> 203 </structures>
206 </release> 204 </release>
207 </grit> 205 </grit>
OLDNEW
« no previous file with comments | « ash/common/wm/dock/docked_window_layout_manager.cc ('k') | ash/resources/default_100_percent/common/shelf/shelf_background.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698