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

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

Issue 11824009: Use mac browser action overflow asset on all platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/theme/default_200_percent/mac/browser_actions_overflow_pressed.png ('k') | no next file » | 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 </if> 101 </if>
102 <if expr="pp_ifdef('chromeos')"> 102 <if expr="pp_ifdef('chromeos')">
103 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="choose_file.png" /> 103 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE _FILE" file="choose_file.png" />
104 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_RECORD _VIDEO" file="record_video.png" /> 104 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_RECORD _VIDEO" file="record_video.png" />
105 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="take_photo.png" /> 105 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P HOTO" file="take_photo.png" />
106 </if> 106 </if>
107 <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> 107 <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
108 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="br owser_action.png" /> 108 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="br owser_action.png" />
109 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file=" browser_action_hover.png" /> 109 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file=" browser_action_hover.png" />
110 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file=" browser_action_pressed.png" /> 110 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file=" browser_action_pressed.png" />
111 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW " file="browser_actions_overflow.png" />
112 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW _H" file="browser_actions_overflow_hover.png" />
113 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW _P" file="browser_actions_overflow_pressed.png" />
114 </if> 111 </if>
115 <if expr="pp_ifdef('toolkit_views') or is_macosx"> 112 <if expr="pp_ifdef('toolkit_views') or is_macosx">
116 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co mmon/browser_action_normal.png" /> 113 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co mmon/browser_action_normal.png" />
117 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file=" common/browser_action_hover.png" /> 114 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file=" common/browser_action_hover.png" />
118 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file=" common/browser_action_pressed.png" /> 115 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file=" common/browser_action_pressed.png" />
119 </if> 116 </if>
120 <if expr="pp_ifdef('toolkit_views')"> 117 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="common/browser_actions_overflow_normal.png" />
121 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW " file="common/browser_actions_overflow_normal.png" /> 118 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H " file="common/browser_actions_overflow_hover.png" />
122 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW _H" file="common/browser_actions_overflow_hover.png" /> 119 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P " file="common/browser_actions_overflow_pressed.png" />
123 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW _P" file="common/browser_actions_overflow_pressed.png" />
124 </if>
125 <if expr="is_macosx">
126 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW " file="mac/browser_actions_overflow_normal.png" />
127 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW _H" file="mac/browser_actions_overflow_hover.png" />
128 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW _P" file="mac/browser_actions_overflow_pressed.png" />
129 </if>
130 <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="c lose_button_mask.png" /> 120 <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="c lose_button_mask.png" />
131 <if expr="is_win"> 121 <if expr="is_win">
132 <structure type="chrome_scaled_image" name="IDR_CONFLICT_BADGE" file="co nflict_badge.png" /> 122 <structure type="chrome_scaled_image" name="IDR_CONFLICT_BADGE" file="co nflict_badge.png" />
133 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file=" common/favicon_conflicts.png" /> 123 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file=" common/favicon_conflicts.png" />
134 <structure type="chrome_scaled_image" name="IDR_CONFLICT_MENU" file="con flict_menu.png" /> 124 <structure type="chrome_scaled_image" name="IDR_CONFLICT_MENU" file="con flict_menu.png" />
135 </if> 125 </if>
136 <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_BOTTOM_CENTER_ V" file="constrained_bottom_center_v.png" /> 126 <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_BOTTOM_CENTER_ V" file="constrained_bottom_center_v.png" />
137 <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_BOTTOM_LEFT_CO RNER_V" file="constrained_bottom_left_corner_v.png" /> 127 <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_BOTTOM_LEFT_CO RNER_V" file="constrained_bottom_left_corner_v.png" />
138 <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_BOTTOM_RIGHT_C ORNER_V" file="constrained_bottom_right_corner_v.png" /> 128 <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_BOTTOM_RIGHT_C ORNER_V" file="constrained_bottom_right_corner_v.png" />
139 <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_LEFT_SIDE_V" f ile="constrained_left_side_v.png" /> 129 <structure type="chrome_scaled_image" name="IDR_CONSTRAINED_LEFT_SIDE_V" f ile="constrained_left_side_v.png" />
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="goo gle_chrome/webstore_icon.png" /> 881 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="goo gle_chrome/webstore_icon.png" />
892 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" /> 882 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" />
893 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" /> 883 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" />
894 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> 884 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" />
895 </if> 885 </if>
896 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> 886 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" />
897 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> 887 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" />
898 </structures> 888 </structures>
899 </release> 889 </release>
900 </grit> 890 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_200_percent/mac/browser_actions_overflow_pressed.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698