ash/resources/ash_resources.grd - Issue 2737353002: Reland 1e65c53ffdbcab7f2d25f064a3a7540166101e54 with fix for bad merge.

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

Issue 2737353002: Reland 1e65c53ffdbcab7f2d25f064a3a7540166101e54 with fix for bad merge. (Closed)

Patch Set: with fix Created 3 years, 9 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:

« no previous file with comments | « ash/common/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/resources/default_100_percent/cros/network/status_network_info.png » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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">

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_LOW_PO WER_CHARGER" file="cros/notification/notification_low_power_charger.png" />	91 <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_LOW_PO WER_CHARGER" file="cros/notification/notification_low_power_charger.png" />

92 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BRIGHTNES S" file="cros/status/status_brightness.png" />	92 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BRIGHTNES S" file="cros/status/status_brightness.png" />

93 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BUBBLE_SE SSION_LENGTH_LIMIT" file="cros/status/status_session_length_timer.png" />	93 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BUBBLE_SE SSION_LENGTH_LIMIT" file="cros/status/status_session_length_timer.png" />

94 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ DISABLED" file="cros/network/status_cellular_disabled.png" />	94 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ DISABLED" file="cros/network/status_cellular_disabled.png" />

95 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ DISABLED_HOVER" file="cros/network/status_cellular_disabled_hover.png" />	95 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ DISABLED_HOVER" file="cros/network/status_cellular_disabled_hover.png" />

96 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ ENABLED" file="cros/network/status_cellular_enabled.png" />	96 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ ENABLED" file="cros/network/status_cellular_enabled.png" />

97 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ ENABLED_HOVER" file="cros/network/status_cellular_enabled_hover.png" />	97 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ ENABLED_HOVER" file="cros/network/status_cellular_enabled_hover.png" />

98 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CHILD_USE R" file="cros/status/status_child_user.png" />	98 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CHILD_USE R" file="cros/status/status_child_user.png" />

99 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRIS E" file="cros/status/status_managed.png" />	99 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRIS E" file="cros/status/status_managed.png" />

100 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SUPERVISE D_USER" file="cros/status/status_managed_mode_user.png" />	100 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SUPERVISE D_USER" file="cros/status/status_managed_mode_user.png" />

101 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_I NFO" file="cros/network/status_network_info.png" />

102 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_I NFO_HOVER" file="cros/network/status_network_info_hover.png" />

103 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICAT ION_SESSION_LENGTH_LIMIT" file="cros/notification/notification_session_length_ti mer.png" />	101 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NOTIFICAT ION_SESSION_LENGTH_LIMIT" file="cros/notification/notification_session_length_ti mer.png" />

104 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL" file="cros/status/status_power_small_all.png" />	102 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL" file="cros/status/status_power_small_all.png" />

105 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL_CHARGING_UNRELIABLE" file="cros/status/status_power_small_all_fluctuating.png " />	103 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL_CHARGING_UNRELIABLE" file="cros/status/status_power_small_all_fluctuating.png " />

106 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL_CHARGING_UNRELIABLE_DARK" file="cros/status/status_power_small_all_dark_fluct uating.png" />	104 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL_CHARGING_UNRELIABLE_DARK" file="cros/status/status_power_small_all_dark_fluct uating.png" />

107 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL_DARK" file="cros/status/status_power_small_all_dark.png" />	105 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMA LL_DARK" file="cros/status/status_power_small_all_dark.png" />

108 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING " file="cros/status/status_recording.png" />	106 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING " file="cros/status/status_recording.png" />

109 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING _RED" file="cros/status/status_recording_red.png" />	107 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING _RED" file="cros/status/status_recording_red.png" />

110 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="cros/status/status_settings.png" />	108 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="cros/status/status_settings.png" />

111 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED" file="cros/network/status_wifi_disabled.png" />	109 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED" file="cros/network/status_wifi_disabled.png" />

112 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED_HOVER" file="cros/network/status_wifi_disabled_hover.png" />	110 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED_HOVER" file="cros/network/status_wifi_disabled_hover.png" />

113 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED" file="cros/network/status_wifi_enabled.png" />	111 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED" file="cros/network/status_wifi_enabled.png" />

114 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED_HOVER" file="cros/network/status_wifi_enabled_hover.png" />	112 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED_HOVER" file="cros/network/status_wifi_enabled_hover.png" />

115 </if>	113 </if>

116	114

117 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_BOTTOM" file="common/window_header_shade_bottom_inactive.png" />	115 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_BOTTOM" file="common/window_header_shade_bottom_inactive.png" />

118 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_LEFT" file="common/window_header_shade_left_inactive.png" />	116 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_LEFT" file="common/window_header_shade_left_inactive.png" />

119 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_RIGHT" file="common/window_header_shade_right_inactive.png" />	117 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_RIGHT" file="common/window_header_shade_right_inactive.png" />

120 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_TOP" file="common/window_header_shade_top_inactive.png" />	118 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_TOP" file="common/window_header_shade_top_inactive.png" />

121	119

122 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" />	120 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" />

123 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" />	121 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" />

124 </structures>	122 </structures>

125 </release>	123 </release>

126 </grit>	124 </grit>

OLD	NEW