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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 871373011: Child accounts icons added to Chrome OS notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Oshima's comments addressed. Created 5 years, 11 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
« ash/system/chromeos/supervised/tray_supervised_user.cc ('K') | « chrome/app/theme/default_200_percent/common/child_user_invert.png ('k') | ui/login/account_picker/user_pod_row.css » ('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 <!-- This grd file contains images that are pre-scaled for device scale 2 <!-- This grd file contains images that are pre-scaled for device scale
3 factors. The image returned by |base::ResourceBundle::GetImageNamed| 3 factors. The image returned by |base::ResourceBundle::GetImageNamed|
4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The 4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The
5 |fallback_to_low_resolution| attribute controls behavior when 5 |fallback_to_low_resolution| attribute controls behavior when
6 an image file is missing for target scale factor. If true, chrome 6 an image file is missing for target scale factor. If true, chrome
7 will automatically scale the 1x image to the target scale factor. 7 will automatically scale the 1x image to the target scale factor.
8 If false, build will fail due to missing resources. This is 8 If false, build will fail due to missing resources. This is
9 currently set to true for all resources, but the default will 9 currently set to true for all resources, but the default will
10 become false in near future. 10 become false in near future.
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file=" common/browser_action_pressed.png" /> 145 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file=" common/browser_action_pressed.png" />
146 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_R" file=" common/browser_action_raised.png" /> 146 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_R" file=" common/browser_action_raised.png" />
147 </if> 147 </if>
148 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="common/browser_actions_overflow_normal.png" /> 148 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="common/browser_actions_overflow_normal.png" />
149 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H " file="common/browser_actions_overflow_hover.png" /> 149 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H " file="common/browser_actions_overflow_hover.png" />
150 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P " file="common/browser_actions_overflow_pressed.png" /> 150 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P " file="common/browser_actions_overflow_pressed.png" />
151 <if expr="chromeos"> 151 <if expr="chromeos">
152 <structure type="chrome_scaled_image" name="IDR_BUILDINGS_ILLUSTRATION" file="cros/buildings_illustration.png" /> 152 <structure type="chrome_scaled_image" name="IDR_BUILDINGS_ILLUSTRATION" file="cros/buildings_illustration.png" />
153 </if> 153 </if>
154 <structure type="chrome_scaled_image" name="IDR_CHEVRON_LEFT" file="common /chevron_left.png" /> 154 <structure type="chrome_scaled_image" name="IDR_CHEVRON_LEFT" file="common /chevron_left.png" />
155 <structure type="chrome_scaled_image" name="IDR_CHILD_USER_ICON" file="com mon/child_user_invert.png" />
155 <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="c ommon/close_button_mask.png" /> 156 <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="c ommon/close_button_mask.png" />
156 <if expr="is_win"> 157 <if expr="is_win">
157 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file=" common/favicon_conflicts.png" /> 158 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file=" common/favicon_conflicts.png" />
158 </if> 159 </if>
159 <if expr="chromeos"> 160 <if expr="chromeos">
160 <structure type="chrome_scaled_image" name="IDR_CONSUMER_MANAGEMENT_NOTI FICATION_ICON" file="cros/consumer_management_notification_icon.png" /> 161 <structure type="chrome_scaled_image" name="IDR_CONSUMER_MANAGEMENT_NOTI FICATION_ICON" file="cros/consumer_management_notification_icon.png" />
161 </if> 162 </if>
162 <!-- Ash doesn't draw rounded content area, so needs a special top 163 <!-- Ash doesn't draw rounded content area, so needs a special top
163 image. --> 164 image. -->
164 <if expr="not use_ash"> 165 <if expr="not use_ash">
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
1213 <!-- People search images --> 1214 <!-- People search images -->
1214 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1215 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1215 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1216 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1216 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1217 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1217 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1218 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1218 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1219 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1219 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1220 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1220 </structures> 1221 </structures>
1221 </release> 1222 </release>
1222 </grit> 1223 </grit>
OLDNEW
« ash/system/chromeos/supervised/tray_supervised_user.cc ('K') | « chrome/app/theme/default_200_percent/common/child_user_invert.png ('k') | ui/login/account_picker/user_pod_row.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698