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

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

Issue 2374803002: Remove a bunch of pre-MD toolbar code and assets. (Closed)
Patch Set: fix mac? Created 4 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
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 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 </if> 619 </if>
620 <if expr="enable_app_list"> 620 <if expr="enable_app_list">
621 <structure type="chrome_scaled_image" name="IDR_PROFILE_PICTURE_LOADING" file="profile_loading.png" /> 621 <structure type="chrome_scaled_image" name="IDR_PROFILE_PICTURE_LOADING" file="profile_loading.png" />
622 </if> 622 </if>
623 <if expr="chromeos"> 623 <if expr="chromeos">
624 <structure type="chrome_scaled_image" name="IDR_RESET_WARNING" file="cro s/reset_warning.png" /> 624 <structure type="chrome_scaled_image" name="IDR_RESET_WARNING" file="cro s/reset_warning.png" />
625 </if> 625 </if>
626 <structure type="chrome_scaled_image" name="IDR_QUESTION_MARK" file="commo n/question_mark.png" /> 626 <structure type="chrome_scaled_image" name="IDR_QUESTION_MARK" file="commo n/question_mark.png" />
627 <structure type="chrome_scaled_image" name="IDR_PROFILE_SELECTED" file="co mmon/profile_selected.png" /> 627 <structure type="chrome_scaled_image" name="IDR_PROFILE_SELECTED" file="co mmon/profile_selected.png" />
628 <structure type="chrome_scaled_image" name="IDR_REGISTER_PROTOCOL_HANDLER" file="register_protocol_handler.png" /> 628 <structure type="chrome_scaled_image" name="IDR_REGISTER_PROTOCOL_HANDLER" file="register_protocol_handler.png" />
629 <if expr="toolkit_views or is_macosx or is_ios">
630 <structure type="chrome_scaled_image" name="IDR_RELOAD" file="common/bro wser_reload_normal.png" />
631 <structure type="chrome_scaled_image" name="IDR_RELOAD_D" file="common/b rowser_reload_disabled.png" />
632 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="common/b rowser_reload_hover.png" />
633 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="common/b rowser_reload_pressed.png" />
634 </if>
635 <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file= "common/restore_button_mask.png" /> 629 <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file= "common/restore_button_mask.png" />
636 <if expr="is_macosx"> 630 <if expr="is_macosx">
637 <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" fi le="legacy/safebrowsing_warning.png" /> 631 <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" fi le="legacy/safebrowsing_warning.png" />
638 <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_ACTIVE" fi le="legacy/save_password_active.png" /> 632 <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_ACTIVE" fi le="legacy/save_password_active.png" />
639 <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_INACTIVE" file="legacy/save_password_inactive.png" /> 633 <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_INACTIVE" file="legacy/save_password_inactive.png" />
640 </if> 634 </if>
641 <structure type="chrome_scaled_image" name="IDR_SCREEN_CAPTURE_NOTIFICATIO N_GRIP" file="screen_capture_notification_grip.png" /> 635 <structure type="chrome_scaled_image" name="IDR_SCREEN_CAPTURE_NOTIFICATIO N_GRIP" file="screen_capture_notification_grip.png" />
642 <structure type="chrome_scaled_image" name="IDR_SCREENSHOT_NOTIFICATION_IC ON" file="common/notification_screenshot_icon.png" /> 636 <structure type="chrome_scaled_image" name="IDR_SCREENSHOT_NOTIFICATION_IC ON" file="common/notification_screenshot_icon.png" />
643 <if expr="chromeos"> 637 <if expr="chromeos">
644 <structure type="chrome_scaled_image" name="IDR_SECONDARY_USER_SETTINGS" file="cros/secondary_user_settings.png" /> 638 <structure type="chrome_scaled_image" name="IDR_SECONDARY_USER_SETTINGS" file="cros/secondary_user_settings.png" />
645 </if> 639 </if>
646 <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="co mmon/favicon_settings.png" /> 640 <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="co mmon/favicon_settings.png" />
647 <if expr="is_macosx"> 641 <if expr="is_macosx">
648 <structure type="chrome_scaled_image" name="IDR_STAR" file="common/star. png" /> 642 <structure type="chrome_scaled_image" name="IDR_STAR" file="common/star. png" />
649 <structure type="chrome_scaled_image" name="IDR_STAR_LIT" file="common/s tar_lit.png" /> 643 <structure type="chrome_scaled_image" name="IDR_STAR_LIT" file="common/s tar_lit.png" />
650 </if> 644 </if>
651 <if expr="toolkit_views or is_macosx or is_ios">
652 <structure type="chrome_scaled_image" name="IDR_STOP" file="common/brows er_stop_normal.png" />
653 <structure type="chrome_scaled_image" name="IDR_STOP_D" file="common/bro wser_stop_disabled.png" />
654 <structure type="chrome_scaled_image" name="IDR_STOP_H" file="common/bro wser_stop_hover.png" />
655 <structure type="chrome_scaled_image" name="IDR_STOP_P" file="common/bro wser_stop_pressed.png" />
656 </if>
657 <if expr="chromeos"> 645 <if expr="chromeos">
658 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_ILLUSTRATION_ START" file="cros/supervised_illustration_start.png" /> 646 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_ILLUSTRATION_ START" file="cros/supervised_illustration_start.png" />
659 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_ILLUSTRATION_ DONE" file="cros/supervised_illsutration_done.png" /> 647 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_ILLUSTRATION_ DONE" file="cros/supervised_illsutration_done.png" />
660 <structure type="chrome_scaled_image" name="IDR_LOGO_AVATAR_CIRCLE_BLUE_ COLOR" file="cros/logo_avatar_circle_blue_color.png" /> 648 <structure type="chrome_scaled_image" name="IDR_LOGO_AVATAR_CIRCLE_BLUE_ COLOR" file="cros/logo_avatar_circle_blue_color.png" />
661 <structure type="chrome_scaled_image" name="IDR_LOGO_GOOGLE_COLOR_90" fi le="cros/logo_google_color_90.png" /> 649 <structure type="chrome_scaled_image" name="IDR_LOGO_GOOGLE_COLOR_90" fi le="cros/logo_google_color_90.png" />
662 </if> 650 </if>
663 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_PLACEHOLDE R" file="common/supervised_user_placeholder.png" /> 651 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_PLACEHOLDE R" file="common/supervised_user_placeholder.png" />
664 <if expr="is_macosx"> 652 <if expr="is_macosx">
665 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file= "mac/tab_active_center.png" /> 653 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file= "mac/tab_active_center.png" />
666 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="m ac/tab_active_left.png" /> 654 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="m ac/tab_active_left.png" />
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 <structure type="chrome_scaled_image" name="IDR_THROBBER_INCOGNITO" file ="mac/throbber_incognito.png" /> 744 <structure type="chrome_scaled_image" name="IDR_THROBBER_INCOGNITO" file ="mac/throbber_incognito.png" />
757 </if> 745 </if>
758 <if expr="use_ash"> 746 <if expr="use_ash">
759 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_LEFT" file ="common/toolbar_shade_left.png" /> 747 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_LEFT" file ="common/toolbar_shade_left.png" />
760 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_RIGHT" fil e="common/toolbar_shade_right.png" /> 748 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_RIGHT" fil e="common/toolbar_shade_right.png" />
761 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file= "common/toolbar_shade_top.png" /> 749 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file= "common/toolbar_shade_top.png" />
762 </if> 750 </if>
763 <if expr="is_macosx or is_ios"> 751 <if expr="is_macosx or is_ios">
764 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file= "mac/toolbar_shade_top.png" /> 752 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file= "mac/toolbar_shade_top.png" />
765 </if> 753 </if>
766 <if expr="toolkit_views or is_macosx or is_ios">
767 <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/brow ser_tools_normal.png" />
768 <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="common/br owser_tools_hover.png" />
769 <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="common/br owser_tools_pressed.png" />
770 </if>
771 754
772 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_B OTTOM_LEFT" file="common/toolbar_action_highlight_bottom_left.png" /> 755 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_B OTTOM_LEFT" file="common/toolbar_action_highlight_bottom_left.png" />
773 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_B OTTOM" file="common/toolbar_action_highlight_bottom.png" /> 756 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_B OTTOM" file="common/toolbar_action_highlight_bottom.png" />
774 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_B OTTOM_RIGHT" file="common/toolbar_action_highlight_bottom_right.png" /> 757 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_B OTTOM_RIGHT" file="common/toolbar_action_highlight_bottom_right.png" />
775 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_C ENTER" file="common/toolbar_action_highlight_center.png" /> 758 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_C ENTER" file="common/toolbar_action_highlight_center.png" />
776 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_L EFT" file="common/toolbar_action_highlight_left.png" /> 759 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_L EFT" file="common/toolbar_action_highlight_left.png" />
777 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_R IGHT" file="common/toolbar_action_highlight_right.png" /> 760 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_R IGHT" file="common/toolbar_action_highlight_right.png" />
778 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_T OP_LEFT" file="common/toolbar_action_highlight_top_left.png" /> 761 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_T OP_LEFT" file="common/toolbar_action_highlight_top_left.png" />
779 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_T OP" file="common/toolbar_action_highlight_top.png" /> 762 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_T OP" file="common/toolbar_action_highlight_top.png" />
780 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_T OP_RIGHT" file="common/toolbar_action_highlight_top_right.png" /> 763 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_ACTION_HIGHLIGHT_T OP_RIGHT" file="common/toolbar_action_highlight_top_right.png" />
781
782 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BEZEL_HOVER" file= "common/browser_toolbar_bezel_hover.png" /> 764 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BEZEL_HOVER" file= "common/browser_toolbar_bezel_hover.png" />
783 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BEZEL_PRESSED" fil e="common/browser_toolbar_bezel_pressed.png" /> 765 <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BEZEL_PRESSED" fil e="common/browser_toolbar_bezel_pressed.png" />
784 <structure type="chrome_scaled_image" name="IDR_TOOLS_BAR" file="common/br owser_tools_bar.png" /> 766
785 <structure type="chrome_scaled_image" name="IDR_TOOLS_BAR_LOW" file="commo n/browser_tools_bar_low.png" />
786 <structure type="chrome_scaled_image" name="IDR_TOOLS_BAR_MEDIUM" file="co mmon/browser_tools_bar_medium.png" />
787 <structure type="chrome_scaled_image" name="IDR_TOOLS_BAR_HIGH" file="comm on/browser_tools_bar_high.png" />
788 <if expr="is_macosx"> 767 <if expr="is_macosx">
789 <structure type="chrome_scaled_image" name="IDR_TRANSLATE" file="legacy/ translate.png" /> 768 <structure type="chrome_scaled_image" name="IDR_TRANSLATE" file="legacy/ translate.png" />
790 <structure type="chrome_scaled_image" name="IDR_TRANSLATE_ACTIVE" file=" legacy/translate_active.png" /> 769 <structure type="chrome_scaled_image" name="IDR_TRANSLATE_ACTIVE" file=" legacy/translate_active.png" />
791 </if> 770 </if>
792 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_LOW" file="common/update_menu_severity_low.png" /> 771 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_LOW" file="common/update_menu_severity_low.png" />
793 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_MEDIU M" file="common/update_menu_severity_medium.png" /> 772 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_MEDIU M" file="common/update_menu_severity_medium.png" />
794 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_HIGH" file="common/update_menu_severity_high.png" /> 773 <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_HIGH" file="common/update_menu_severity_high.png" />
795 <structure type="chrome_scaled_image" name="IDR_USB_NOTIFICATION_ICON" fil e="common/notification_usb_icon.png" /> 774 <structure type="chrome_scaled_image" name="IDR_USB_NOTIFICATION_ICON" fil e="common/notification_usb_icon.png" />
796 <if expr="chromeos"> 775 <if expr="chromeos">
797 <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_CAPTURE" file ="cros/snapshot_wide.png" /> 776 <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_CAPTURE" file ="cros/snapshot_wide.png" />
(...skipping 13 matching lines...) Expand all
811 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> 790 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" />
812 </if> 791 </if>
813 <if expr="is_macosx"> 792 <if expr="is_macosx">
814 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy /zoom_minus.png" /> 793 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy /zoom_minus.png" />
815 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/ zoom_plus.png" /> 794 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/ zoom_plus.png" />
816 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac y/zoom_reset.png" /> 795 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac y/zoom_reset.png" />
817 </if> 796 </if>
818 </structures> 797 </structures>
819 </release> 798 </release>
820 </grit> 799 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698