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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win64 compile. Created 6 years, 8 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
« build/common.gypi ('K') | « build/common.gypi ('k') | chrome/browser/extensions/window_open_apitest.cc » ('j') | chrome/browser/fullscreen_aurax11.cc » ('J')
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 <if expr="is_win"> 149 <if expr="is_win">
150 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file=" common/favicon_conflicts.png" /> 150 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file=" common/favicon_conflicts.png" />
151 </if> 151 </if>
152 <!-- Ash doesn't draw rounded content area, so needs a special top 152 <!-- Ash doesn't draw rounded content area, so needs a special top
153 image. --> 153 image. -->
154 <if expr="not use_ash"> 154 <if expr="not use_ash">
155 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file ="content_top_center.png" /> 155 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file ="content_top_center.png" />
156 </if> 156 </if>
157 <if expr="use_ash"> 157 <if expr="use_ash">
158 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file ="common/ash/content_top_center.png" /> 158 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file ="common/ash/content_top_center.png" />
159 <if expr="is_win"> 159 <if expr="not chromeos">
160 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_WIN " file="content_top_center.png" /> 160 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_DES KTOP" file="content_top_center.png" />
161 </if> 161 </if>
162 </if> 162 </if>
163 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" f ile="content_top_left_corner.png" /> 163 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" f ile="content_top_left_corner.png" />
164 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MA SK" file="content_top_left_corner_mask.png" /> 164 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MA SK" file="content_top_left_corner_mask.png" />
165 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" /> 165 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" />
166 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_M ASK" file="content_top_right_corner_mask.png" /> 166 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_M ASK" file="content_top_right_corner_mask.png" />
167 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSI ON" file="common/controlled_setting_extension.png" /> 167 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSI ON" file="common/controlled_setting_extension.png" />
168 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATO RY" file="common/controlled_setting_mandatory.png" /> 168 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATO RY" file="common/controlled_setting_mandatory.png" />
169 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_OWNER" file="common/controlled_setting_owner.png" /> 169 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_OWNER" file="common/controlled_setting_owner.png" />
170 <if expr="chromeos"> 170 <if expr="chromeos">
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file ="common/omnibox_tts_selected.png" /> 642 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file ="common/omnibox_tts_selected.png" />
643 <if expr="not toolkit_views and not is_macosx and not is_ios"> 643 <if expr="not toolkit_views and not is_macosx and not is_ios">
644 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common/o tr_icon.png" /> 644 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common/o tr_icon.png" />
645 </if> 645 </if>
646 <if expr="toolkit_views"> 646 <if expr="toolkit_views">
647 <if expr="not use_ash"> 647 <if expr="not use_ash">
648 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /otr_icon.png" /> 648 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /otr_icon.png" />
649 </if> 649 </if>
650 <if expr="use_ash"> 650 <if expr="use_ash">
651 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /ash/otr_icon.png" /> 651 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /ash/otr_icon.png" />
652 <if expr="is_win"> 652 <if expr="not chromeos">
653 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_WIN" file=" common/otr_icon.png" /> 653 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_DESKTOP" fi le="common/otr_icon.png" />
654 </if> 654 </if>
655 </if> 655 </if>
656 </if> 656 </if>
657 <if expr="(is_macosx or is_ios) and not toolkit_views"> 657 <if expr="(is_macosx or is_ios) and not toolkit_views">
658 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_ icon.png" /> 658 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_ icon.png" />
659 </if> 659 </if>
660 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file= "common/otr_icon.png" /> 660 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file= "common/otr_icon.png" />
661 <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file= "common/overlay_drop_shadow.png" /> 661 <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file= "common/overlay_drop_shadow.png" />
662 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pagein fo_bad.png" /> 662 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pagein fo_bad.png" />
663 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="pagei nfo_good.png" /> 663 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="pagei nfo_good.png" />
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi le="theme_frame_inactive.png" /> 1175 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi le="theme_frame_inactive.png" />
1176 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f ile="theme_frame_incognito.png" /> 1176 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f ile="theme_frame_incognito.png" />
1177 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN ACTIVE" file="theme_frame_incognito_inactive.png" /> 1177 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN ACTIVE" file="theme_frame_incognito_inactive.png" />
1178 </if> 1178 </if>
1179 <if expr="use_ash"> 1179 <if expr="use_ash">
1180 <!-- Ash has a gray frame, Windows uses blue. --> 1180 <!-- Ash has a gray frame, Windows uses blue. -->
1181 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="commo n/ash/theme_frame_active.png" /> 1181 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="commo n/ash/theme_frame_active.png" />
1182 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi le="common/ash/theme_frame_inactive.png" /> 1182 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi le="common/ash/theme_frame_inactive.png" />
1183 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f ile="common/ash/theme_frame_incognito_active.png" /> 1183 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f ile="common/ash/theme_frame_incognito_active.png" />
1184 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN ACTIVE" file="common/ash/theme_frame_incognito_inactive.png" /> 1184 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN ACTIVE" file="common/ash/theme_frame_incognito_inactive.png" />
1185 <if expr="is_win"> 1185 <if expr="not chromeos">
1186 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_WIN" file= "theme_frame.png" /> 1186 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_DESKTOP" f ile="theme_frame.png" />
1187 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_W IN" file="theme_frame_inactive.png" /> 1187 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_D ESKTOP" file="theme_frame_inactive.png" />
1188 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_ WIN" file="theme_frame_incognito.png" /> 1188 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_ DESKTOP" file="theme_frame_incognito.png" />
1189 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_ INACTIVE_WIN" file="theme_frame_incognito_inactive.png" /> 1189 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_ INACTIVE_DESKTOP" file="theme_frame_incognito_inactive.png" />
1190 </if> 1190 </if>
1191 </if> 1191 </if>
1192 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file= "notused.png" /> 1192 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file= "notused.png" />
1193 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTI VE" file="notused.png" /> 1193 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTI VE" file="notused.png" />
1194 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" fil e="notused.png" /> 1194 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" fil e="notused.png" />
1195 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file ="common/ntp_background.png" /> 1195 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file ="common/ntp_background.png" />
1196 <if expr="not use_ash and not is_macosx and not is_ios"> 1196 <if expr="not use_ash and not is_macosx and not is_ios">
1197 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="theme_tab_background.png" /> 1197 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="theme_tab_background.png" />
1198 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="theme_tab_background_incognito.png" /> 1198 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="theme_tab_background_incognito.png" />
1199 </if> 1199 </if>
1200 <if expr="use_ash"> 1200 <if expr="use_ash">
1201 <!-- Ash has gray tab backgrounds, Windows uses blue. --> 1201 <!-- Ash has gray tab backgrounds, Windows uses blue. -->
1202 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="common/ash/theme_default_inactive.png" /> 1202 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="common/ash/theme_default_inactive.png" />
1203 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="common/ash/theme_default_inactive.png" /> 1203 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="common/ash/theme_default_inactive.png" />
1204 <if expr="is_win"> 1204 <if expr="not chromeos">
1205 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_W IN" file="theme_tab_background.png" /> 1205 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_D ESKTOP" file="theme_tab_background.png" />
1206 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I NCOGNITO_WIN" file="theme_tab_background_incognito.png" /> 1206 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I NCOGNITO_DESKTOP" file="theme_tab_background_incognito.png" />
1207 </if> 1207 </if>
1208 </if> 1208 </if>
1209 <if expr="is_macosx or is_ios"> 1209 <if expr="is_macosx or is_ios">
1210 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="mac/theme_default_inactive.png" /> 1210 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="mac/theme_default_inactive.png" />
1211 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA CTIVE" file="mac/theme_default_inactive_background.png" /> 1211 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA CTIVE" file="mac/theme_default_inactive_background.png" />
1212 </if> 1212 </if>
1213 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi le="theme_tab_background_glass.png" /> 1213 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi le="theme_tab_background_glass.png" />
1214 <if expr="not use_ash and not is_macosx and not is_ios"> 1214 <if expr="not use_ash and not is_macosx and not is_ios">
1215 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default.png" /> 1215 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default.png" />
1216 </if> 1216 </if>
1217 <if expr="use_ash"> 1217 <if expr="use_ash">
1218 <!-- Ash has a dark gray toolbar background, Windows has light gray. --> 1218 <!-- Ash has a dark gray toolbar background, Windows has light gray. -->
1219 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com mon/ash/theme_default_active.png" /> 1219 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com mon/ash/theme_default_active.png" />
1220 <if expr="is_win"> 1220 <if expr="not chromeos">
1221 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_WIN" fil e="theme_toolbar_default.png" /> 1221 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_DESKTOP" file="theme_toolbar_default.png" />
1222 </if> 1222 </if>
1223 </if> 1223 </if>
1224 <if expr="is_macosx or is_ios"> 1224 <if expr="is_macosx or is_ios">
1225 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac /theme_default_active.png" /> 1225 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac /theme_default_active.png" />
1226 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="mac/theme_default_active_background.png" /> 1226 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="mac/theme_default_active_background.png" />
1227 </if> 1227 </if>
1228 <!-- Instant Extended API toolbar background is common for all platforms. --> 1228 <!-- Instant Extended API toolbar background is common for all platforms. -->
1229 <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKG ROUND" file="notused.png" /> 1229 <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKG ROUND" file="notused.png" />
1230 <structure type="chrome_scaled_image" name="IDR_THROBBER_LIGHT" file="thro bber_light.png" /> 1230 <structure type="chrome_scaled_image" name="IDR_THROBBER_LIGHT" file="thro bber_light.png" />
1231 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="th robber_waiting.png" /> 1231 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="th robber_waiting.png" />
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1305 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1306 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1306 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1307 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1307 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1308 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1308 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1309 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1309 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1310 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1310 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1311 1311
1312 </structures> 1312 </structures>
1313 </release> 1313 </release>
1314 </grit> 1314 </grit>
OLDNEW
« build/common.gypi ('K') | « build/common.gypi ('k') | chrome/browser/extensions/window_open_apitest.cc » ('j') | chrome/browser/fullscreen_aurax11.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698