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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 24647003: Redesign of the avatar menu button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better fix for app/popup browser crash Created 7 years, 2 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profiles_state.h » ('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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file= "profile_avatar_soccer.png" /> 706 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file= "profile_avatar_soccer.png" />
707 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file= "profile_avatar_burger.png" /> 707 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file= "profile_avatar_burger.png" />
708 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file= "profile_avatar_cat.png" /> 708 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file= "profile_avatar_cat.png" />
709 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file= "profile_avatar_cupcake.png" /> 709 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file= "profile_avatar_cupcake.png" />
710 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file= "profile_avatar_dog.png" /> 710 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file= "profile_avatar_dog.png" />
711 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file= "profile_avatar_horse.png" /> 711 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file= "profile_avatar_horse.png" />
712 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file= "profile_avatar_margarita.png" /> 712 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file= "profile_avatar_margarita.png" />
713 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file= "profile_avatar_note.png" /> 713 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file= "profile_avatar_note.png" />
714 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file= "profile_avatar_sun_cloud.png" /> 714 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file= "profile_avatar_sun_cloud.png" />
715 </if> 715 </if>
716
717 <!-- New style avatar button -->
718 <!-- Windows, themed windows -->
719 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_DROPA RROW" file="win/avatar_button/themed/sign_in_button_arrow.png" />
720 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_BOTTOM" file="win/avatar_button/themed/sign_in_button_bottom.png" />
721 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_bottom_left.png" />
722 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_bottom_right.png" />
723 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_CENTER" file="win/avatar_button/themed/sign_in_button_center.png" />
724 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_LEFT" file="win/avatar_button/themed/sign_in_button_left.png" />
725 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_RIGHT" file="win/avatar_button/themed/sign_in_button_right.png" />
726 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_TOP" file="win/avatar_button/themed/sign_in_button_top.png" />
727 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_TOP_LEFT" file="win/avatar_button/themed/sign_in_button_top_left.png" />
728 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMA L_TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_top_right.png" />
729 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _BOTTOM" file="win/avatar_button/themed/sign_in_button_hover_bottom.png" />
730 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_hover_bottom_left.pn g" />
731 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_hover_bottom_right. png" />
732 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _CENTER" file="win/avatar_button/themed/sign_in_button_hover_center.png" />
733 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _LEFT" file="win/avatar_button/themed/sign_in_button_hover_left.png" />
734 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _RIGHT" file="win/avatar_button/themed/sign_in_button_hover_right.png" />
735 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _TOP" file="win/avatar_button/themed/sign_in_button_hover_top.png" />
736 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _TOP_LEFT" file="win/avatar_button/themed/sign_in_button_hover_top_left.png" />
737 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER _TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_hover_top_right.png" / >
738 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_BOTTOM" file="win/avatar_button/themed/sign_in_button_pressed_bottom.png" />
739 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_bottom_lef t.png" />
740 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_bottom_ri ght.png" />
741 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_CENTER" file="win/avatar_button/themed/sign_in_button_pressed_center.png" />
742 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_left.png" />
743 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_right.png" />
744 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_TOP" file="win/avatar_button/themed/sign_in_button_pressed_top.png" />
745 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_TOP_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_top_left.png" />
746 <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESS ED_TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_top_right.pn g" />
747
748 <!-- Windows, glass windows -->
749 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_DROPAR ROW" file="win/avatar_button/win7/sign_in_button_arrow.png" />
750 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _BOTTOM" file="win/avatar_button/win7/sign_in_button_bottom.png" />
751 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_bottom_left.png" />
752 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_bottom_right.png" />
753 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _CENTER" file="win/avatar_button/win7/sign_in_button_center.png" />
754 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _LEFT" file="win/avatar_button/win7/sign_in_button_left.png" />
755 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _RIGHT" file="win/avatar_button/win7/sign_in_button_right.png" />
756 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _TOP" file="win/avatar_button/win7/sign_in_button_top.png" />
757 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _TOP_LEFT" file="win/avatar_button/win7/sign_in_button_top_left.png" />
758 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL _TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_top_right.png" />
759 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ BOTTOM" file="win/avatar_button/win7/sign_in_button_hover_bottom.png" />
760 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_hover_bottom_left.png" />
761 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_hover_bottom_right.png " />
762 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ CENTER" file="win/avatar_button/win7/sign_in_button_hover_center.png" />
763 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ LEFT" file="win/avatar_button/win7/sign_in_button_hover_left.png" />
764 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ RIGHT" file="win/avatar_button/win7/sign_in_button_hover_right.png" />
765 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ TOP" file="win/avatar_button/win7/sign_in_button_hover_top.png" />
766 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ TOP_LEFT" file="win/avatar_button/win7/sign_in_button_hover_top_left.png" />
767 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_ TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_hover_top_right.png" />
768 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_BOTTOM" file="win/avatar_button/win7/sign_in_button_pressed_bottom.png" />
769 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_bottom_left.p ng" />
770 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_bottom_right .png" />
771 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_CENTER" file="win/avatar_button/win7/sign_in_button_pressed_center.png" />
772 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_left.png" />
773 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_right.png" />
774 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_TOP" file="win/avatar_button/win7/sign_in_button_pressed_top.png" />
775 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_TOP_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_top_left.png" />
776 <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSE D_TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_top_right.png" />
777
716 <if expr="pp_ifdef('chromeos')"> 778 <if expr="pp_ifdef('chromeos')">
717 <structure type="chrome_scaled_image" name="IDR_PROFILE_PICTURE_LOADING" file="profile_loading.png" /> 779 <structure type="chrome_scaled_image" name="IDR_PROFILE_PICTURE_LOADING" file="profile_loading.png" />
718 <structure type="chrome_scaled_image" name="IDR_RESET_WARNING" file="res et_warning.png" /> 780 <structure type="chrome_scaled_image" name="IDR_RESET_WARNING" file="res et_warning.png" />
719 </if> 781 </if>
720 <structure type="chrome_scaled_image" name="IDR_QUESTION_MARK" file="commo n/question_mark.png" /> 782 <structure type="chrome_scaled_image" name="IDR_QUESTION_MARK" file="commo n/question_mark.png" />
721 <structure type="chrome_scaled_image" name="IDR_PROFILE_SELECTED" file="co mmon/profile_selected.png" /> 783 <structure type="chrome_scaled_image" name="IDR_PROFILE_SELECTED" file="co mmon/profile_selected.png" />
722 <structure type="chrome_scaled_image" name="IDR_REGISTER_PROTOCOL_HANDLER" file="register_protocol_handler.png" /> 784 <structure type="chrome_scaled_image" name="IDR_REGISTER_PROTOCOL_HANDLER" file="register_protocol_handler.png" />
723 <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios"> 785 <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
724 <structure type="chrome_scaled_image" name="IDR_RELOAD" file="reload.png " /> 786 <structure type="chrome_scaled_image" name="IDR_RELOAD" file="reload.png " />
725 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="reload_h over.png" /> 787 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="reload_h over.png" />
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1049 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
988 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1050 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
989 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1051 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
990 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1052 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
991 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1053 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
992 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1054 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
993 1055
994 </structures> 1056 </structures>
995 </release> 1057 </release>
996 </grit> 1058 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profiles_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698