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

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

Issue 6901058: Increase infobar height and infobar button height for touch. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Undo inadvertant merge changes (hopefully). Created 9 years, 7 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/large_infobar_theme.png ('k') | chrome/app/theme/theme_resources_large.grd » ('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 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/theme_resources.h" type="rc_header"> 4 <output filename="grit/theme_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" /> 7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" />
8 <output filename="grit/theme_resources_map.h" type="resource_map_header" /> 8 <output filename="grit/theme_resources_map.h" type="resource_map_header" />
9 <output filename="theme_resources.pak" type="data_package" /> 9 <output filename="theme_resources.pak" type="data_package" />
10 <output filename="theme_resources.rc" type="rc_all" /> 10 <output filename="theme_resources.rc" type="rc_all" />
(...skipping 19 matching lines...) Expand all
30 <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" /> 30 <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" />
31 <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" typ e="BINDATA" /> 31 <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" typ e="BINDATA" />
32 <include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" type="B INDATA" /> 32 <include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" type="B INDATA" />
33 <include name="IDR_BOOKMARK_BAR_CHEVRONS" file="chevron.png" type="BINDATA " /> 33 <include name="IDR_BOOKMARK_BAR_CHEVRONS" file="chevron.png" type="BINDATA " />
34 <if expr="os != 'darwin'"> 34 <if expr="os != 'darwin'">
35 <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" t ype="BINDATA" /> 35 <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" t ype="BINDATA" />
36 </if> 36 </if>
37 <if expr="os == 'darwin'"> 37 <if expr="os == 'darwin'">
38 <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.pn g" type="BINDATA" /> 38 <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.pn g" type="BINDATA" />
39 </if> 39 </if>
40 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
41 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
42 <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA " />
43 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
44 <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="B INDATA" /> 40 <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="B INDATA" />
45 <if expr="os.find('win') != -1"> 41 <if expr="os.find('win') != -1">
46 <include name="IDR_CONFLICT_BADGE" file="conflict_badge.png" type="BINDA TA" /> 42 <include name="IDR_CONFLICT_BADGE" file="conflict_badge.png" type="BINDA TA" />
47 <include name="IDR_CONFLICT_MENU" file="conflict_menu.png" type="BINDATA " /> 43 <include name="IDR_CONFLICT_MENU" file="conflict_menu.png" type="BINDATA " />
48 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" /> 44 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" />
49 </if> 45 </if>
50 <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_c enter_v.png" type="BINDATA" /> 46 <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_c enter_v.png" type="BINDATA" />
51 <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bot tom_left_corner_v.png" type="BINDATA" /> 47 <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bot tom_left_corner_v.png" type="BINDATA" />
52 <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bo ttom_right_corner_v.png" type="BINDATA" /> 48 <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bo ttom_right_corner_v.png" type="BINDATA" />
53 <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v. png" type="BINDATA" /> 49 <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v. png" type="BINDATA" />
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 <include name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.pn g" type="BINDATA" /> 129 <include name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.pn g" type="BINDATA" />
134 <include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation _allowed_locationbar_icon.png" type="BINDATA" /> 130 <include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation _allowed_locationbar_icon.png" type="BINDATA" />
135 <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_ denied_locationbar_icon.png" type="BINDATA" /> 131 <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_ denied_locationbar_icon.png" type="BINDATA" />
136 <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_ico n.png" type="BINDATA" /> 132 <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_ico n.png" type="BINDATA" />
137 <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDA TA" /> 133 <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDA TA" />
138 <if expr="os.find('win') != -1"> 134 <if expr="os.find('win') != -1">
139 <include name="IDR_INCOMPATIBILITY_DOT_ACTIVE" file="incompatibility_dot _active.png" type="BINDATA" /> 135 <include name="IDR_INCOMPATIBILITY_DOT_ACTIVE" file="incompatibility_dot _active.png" type="BINDATA" />
140 <include name="IDR_INCOMPATIBILITY_DOT_INACTIVE" file="incompatibility_d ot_inactive.png" type="BINDATA" /> 136 <include name="IDR_INCOMPATIBILITY_DOT_INACTIVE" file="incompatibility_d ot_inactive.png" type="BINDATA" />
141 </if> 137 </if>
142 <include name="IDR_INFO" file="info_small.png" type="BINDATA" /> 138 <include name="IDR_INFO" file="info_small.png" type="BINDATA" />
143 <include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type ="BINDATA" />
144 <include name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" type="BIN DATA" />
145 <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_down loads.png" type="BINDATA" />
146 <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.pn g" type="BINDATA" />
147 <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type= "BINDATA" />
148 <include name="IDR_INFOBAR_QUESTION_MARK" file="infobar_questionmark.png" type="BINDATA" />
149 <include name="IDR_INFOBAR_RESTORE_SESSION" file="infobar_restore.png" typ e="BINDATA" />
150 <include name="IDR_INFOBAR_SAVE_PASSWORD" file="infobar_savepassword.png" type="BINDATA" />
151 <include name="IDR_INFOBAR_SSL_WARNING" file="infobar_insecure.png" type=" BINDATA" />
152 <include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" />
153 <include name="IDR_INFOBAR_COOKIE" file="infobar_cookie.png" type="BINDATA " />
154 <if expr="pp_ifdef('_google_chrome')">
155 <include name="IDR_INFOBAR_TRANSLATE" file="google_chrome/infobar_transl ate.png" type="BINDATA" />
156 </if>
157 <if expr="not pp_ifdef('_google_chrome')">
158 <include name="IDR_INFOBAR_TRANSLATE" file="chromium/infobar_translate.p ng" type="BINDATA" />
159 </if>
160 <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDAT A" /> 139 <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDAT A" />
161 <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" /> 140 <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
162 <include name="IDR_KILLED_TAB" file="killtab.png" type="BINDATA" /> 141 <include name="IDR_KILLED_TAB" file="killtab.png" type="BINDATA" />
163 <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="omnibox_popup_c.png" type="BINDATA" /> 142 <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="omnibox_popup_c.png" type="BINDATA" />
164 <include name="IDR_LOCATIONBG_POPUPMODE_EDGE" file="omnibox_popup_edge.png " type="BINDATA" /> 143 <include name="IDR_LOCATIONBG_POPUPMODE_EDGE" file="omnibox_popup_edge.png " type="BINDATA" />
165 <if expr="os != 'darwin'"> 144 <if expr="os != 'darwin'">
166 <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab .png" type="BINDATA" /> 145 <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab .png" type="BINDATA" />
167 </if> 146 </if>
168 <if expr="os == 'darwin'"> 147 <if expr="os == 'darwin'">
169 <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab _mac.png" type="BINDATA" /> 148 <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab _mac.png" type="BINDATA" />
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 <include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BIN DATA" /> 538 <include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BIN DATA" />
560 <include name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disa bled.png" type="BINDATA" /> 539 <include name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disa bled.png" type="BINDATA" />
561 <include name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png " type="BINDATA" /> 540 <include name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png " type="BINDATA" />
562 <include name="IDR_VOLUME_BUBBLE_UP_ICON" file="volume_up_icon.png" type ="BINDATA" /> 541 <include name="IDR_VOLUME_BUBBLE_UP_ICON" file="volume_up_icon.png" type ="BINDATA" />
563 <include name="IDR_VOLUME_BUBBLE_DOWN_ICON" file="volume_down_icon.png" type="BINDATA" /> 542 <include name="IDR_VOLUME_BUBBLE_DOWN_ICON" file="volume_down_icon.png" type="BINDATA" />
564 <include name="IDR_VOLUME_BUBBLE_MUTE_ICON" file="volume_mute_icon.png" type="BINDATA" /> 543 <include name="IDR_VOLUME_BUBBLE_MUTE_ICON" file="volume_mute_icon.png" type="BINDATA" />
565 </if> 544 </if>
566 </includes> 545 </includes>
567 </release> 546 </release>
568 </grit> 547 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/large_infobar_theme.png ('k') | chrome/app/theme/theme_resources_large.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698