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

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

Issue 297143008: [Win] UI fixes for the new avatar button/bubble auth errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix avatar buttons + redo the bubble warning icon Created 6 years, 6 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 | Annotate | Revision Log
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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_SUPER VISED" file="common/avatar_menu_supervised.png" /> 345 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_SUPER VISED" file="common/avatar_menu_supervised.png" />
346 <structure type="chrome_scaled_image" 346 <structure type="chrome_scaled_image"
347 name="IDR_ICON_PROFILES_EDIT_HOVER" file="common/edit_button_hover.png" /> 347 name="IDR_ICON_PROFILES_EDIT_HOVER" file="common/edit_button_hover.png" />
348 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_EDIT_PRESS ED" file="common/edit_button_pressed.png" /> 348 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_EDIT_PRESS ED" file="common/edit_button_pressed.png" />
349 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_CARET " file="common/carrot_blue.png" /> 349 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_CARET " file="common/carrot_blue.png" />
350 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_AVATAR_PHO TO_FRAME" file="common/avatar_photo_frame.png" /> 350 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_AVATAR_PHO TO_FRAME" file="common/avatar_photo_frame.png" />
351 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_EDIT_CAMER A" file="common/edit_camera.png" /> 351 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_EDIT_CAMER A" file="common/edit_camera.png" />
352 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUEST ION_STABLE" file="common/profile_menu_question_stable.png" /> 352 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUEST ION_STABLE" file="common/profile_menu_question_stable.png" />
353 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUEST ION_HOVER" file="common/profile_menu_question_hover.png" /> 353 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUEST ION_HOVER" file="common/profile_menu_question_hover.png" />
354 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUEST ION_SELECT" file="common/profile_menu_question_select.png" /> 354 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUEST ION_SELECT" file="common/profile_menu_question_select.png" />
355 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_AVATAR_BUT TON_ERROR" file="common/avatar_button_auth_error.png" /> 355 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_ACCOUNT_AU TH_ERROR" file="common/avatar_menu_auth_error.png" />
msw 2014/06/09 21:42:40 Remove the actual image file in this CL too, pleas
noms (inactive) 2014/06/18 18:07:24 As discussed in the Mac CL, going back to using th
356 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_ACCOUNT_BU TTON_ERROR" file="common/avatar_menu_auth_error.png" />
357 </if> 356 </if>
358 <if expr="not is_android and not is_ios and not chromeos"> 357 <if expr="not is_android and not is_ios and not chromeos">
359 <!-- User Manager tutorial --> 358 <!-- User Manager tutorial -->
360 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_WELCOME" file="common/user_manager_tutorial/welcome.png" /> 359 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_WELCOME" file="common/user_manager_tutorial/welcome.png" />
361 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_YOUR_CHROME" file="common/user_manager_tutorial/your_chrome.png" /> 360 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_YOUR_CHROME" file="common/user_manager_tutorial/your_chrome.png" />
362 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_GUESTS" file="common/user_manager_tutorial/guests.png" /> 361 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_GUESTS" file="common/user_manager_tutorial/guests.png" />
363 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_FRIENDS" file="common/user_manager_tutorial/family_and_friends.png" /> 362 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_FRIENDS" file="common/user_manager_tutorial/family_and_friends.png" />
364 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_COMPLETE" file="common/user_manager_tutorial/complete.png" /> 363 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_COMPLETE" file="common/user_manager_tutorial/complete.png" />
365 </if> 364 </if>
366 <if expr="chromeos"> 365 <if expr="chromeos">
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1245 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1247 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1246 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1248 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1247 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1249 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1248 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1250 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1249 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1251 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1250 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1252 1251
1253 </structures> 1252 </structures>
1254 </release> 1253 </release>
1255 </grit> 1254 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698