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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12703039: Inconsistent use of [x] close panel icon. Code changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added recently added local NTP file. Created 7 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:
View unified diff | Download patch
« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | chrome/browser/first_run/try_chrome_dialog_view.cc » ('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 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 </if> 735 </if>
736 <if expr="is_macosx"> 736 <if expr="is_macosx">
737 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file= "mac/tab_active_center.png" /> 737 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file= "mac/tab_active_center.png" />
738 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="m ac/tab_active_left.png" /> 738 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="m ac/tab_active_left.png" />
739 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file=" mac/tab_active_right.png" /> 739 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file=" mac/tab_active_right.png" />
740 <structure type="chrome_scaled_image" name="IDR_SWIPE_BACK" file="back_l arge.png" /> 740 <structure type="chrome_scaled_image" name="IDR_SWIPE_BACK" file="back_l arge.png" />
741 <structure type="chrome_scaled_image" name="IDR_SWIPE_FORWARD" file="for ward_large.png" /> 741 <structure type="chrome_scaled_image" name="IDR_SWIPE_FORWARD" file="for ward_large.png" />
742 <structure type="chrome_scaled_image" name="IDR_TABPOSE_CLOSE" file="mac /tabpose_close.png" /> 742 <structure type="chrome_scaled_image" name="IDR_TABPOSE_CLOSE" file="mac /tabpose_close.png" />
743 </if> 743 </if>
744 <!-- Note: Tab close buttons are not traditional buttons. Tab close butto ns 744 <!-- Note: Tab close buttons are not traditional buttons. Tab close butto ns
745 fill a background with a color from the theme, tile IDR_TAB_CLOSE ove r it, 745 fill a background with a color from the theme, tile IDR_CLOSE_1 over it,
746 then apply IDR_TAB_CLOSE_MASK. See chrome/browser/ui/views/tabs/tab. cc --> 746 then apply IDR_CLOSE_1_MASK. See chrome/browser/ui/views/tabs/tab.cc -->
747 <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> 747 <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
748 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ta b_alpha_left.png" /> 748 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ta b_alpha_left.png" />
749 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="t ab_alpha_right.png" /> 749 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="t ab_alpha_right.png" />
750 </if> 750 </if>
751 <if expr="pp_ifdef('toolkit_views')"> 751 <if expr="pp_ifdef('toolkit_views')">
752 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="co mmon/tab_alpha_left.png" /> 752 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="co mmon/tab_alpha_left.png" />
753 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="c ommon/tab_alpha_right.png" /> 753 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="c ommon/tab_alpha_right.png" />
754 </if> 754 </if>
755 <if expr="is_macosx"> 755 <if expr="is_macosx">
756 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ma c/tab_alpha_left.png" /> 756 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ma c/tab_alpha_left.png" />
757 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="m ac/tab_alpha_right.png" /> 757 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="m ac/tab_alpha_right.png" />
758 </if> 758 </if>
759 <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE" file="common/ta b_close_normal.png" /> 759 <structure type="chrome_scaled_image" name="IDR_CLOSE_1" file="common/clos e_1.png" />
760 <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_H" file="common/ tab_close_hover.png" /> 760 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_H" file="common/cl ose_1_hover.png" />
761 <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_MASK" file="comm on/tab_close_mask.png" /> 761 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_MASK" file="common /close_1_mask.png" />
762 <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_P" file="common/ tab_close_pressed.png" /> 762 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_P" file="common/cl ose_1_pressed.png" />
763 <structure type="chrome_scaled_image" name="IDR_TAB_DROP_DOWN" file="tab_d rop_down.png" /> 763 <structure type="chrome_scaled_image" name="IDR_TAB_DROP_DOWN" file="tab_d rop_down.png" />
764 <structure type="chrome_scaled_image" name="IDR_TAB_DROP_UP" file="tab_dro p_up.png" /> 764 <structure type="chrome_scaled_image" name="IDR_TAB_DROP_UP" file="tab_dro p_up.png" />
765 <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> 765 <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
766 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil e="tab_inactive_center.png" /> 766 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil e="tab_inactive_center.png" />
767 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file= "tab_inactive_left.png" /> 767 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file= "tab_inactive_left.png" />
768 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file ="tab_inactive_right.png" /> 768 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file ="tab_inactive_right.png" />
769 </if> 769 </if>
770 <if expr="pp_ifdef('toolkit_views')"> 770 <if expr="pp_ifdef('toolkit_views')">
771 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil e="common/tab_inactive_center.png" /> 771 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil e="common/tab_inactive_center.png" />
772 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file= "common/tab_inactive_left.png" /> 772 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file= "common/tab_inactive_left.png" />
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" /> 917 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" />
918 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" /> 918 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" />
919 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> 919 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" />
920 </if> 920 </if>
921 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> 921 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" />
922 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> 922 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" />
923 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" /> 923 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" />
924 </structures> 924 </structures>
925 </release> 925 </release>
926 </grit> 926 </grit>
OLDNEW
« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | chrome/browser/first_run/try_chrome_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698