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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 983823004: MacViews: Fix missing browser assets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@titlebar
Patch Set: Undo patchset 5 Created 5 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/secondary/tools/grit/grit_rule.gni ('k') | chrome/browser/ui/views/theme_image_mapper.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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_FRIENDS" file="common/user_manager_tutorial/family_and_friends.png" /> 359 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_FRIENDS" file="common/user_manager_tutorial/family_and_friends.png" />
360 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_COMPLETE" file="common/user_manager_tutorial/complete.png" /> 360 <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORI AL_COMPLETE" file="common/user_manager_tutorial/complete.png" />
361 </if> 361 </if>
362 <if expr="chromeos"> 362 <if expr="chromeos">
363 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" fil e="cros/icon_add_user_white.png" /> 363 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" fil e="cros/icon_add_user_white.png" />
364 <structure type="chrome_scaled_image" name="IDR_ICON_MORE_VERT_WHITE" fi le="cros/icon_more_vert_white.png" /> 364 <structure type="chrome_scaled_image" name="IDR_ICON_MORE_VERT_WHITE" fi le="cros/icon_more_vert_white.png" />
365 <structure type="chrome_scaled_image" name="IDR_ICON_GUEST_WHITE" file=" cros/icon_guest_white.png" /> 365 <structure type="chrome_scaled_image" name="IDR_ICON_GUEST_WHITE" file=" cros/icon_guest_white.png" />
366 <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file=" cros/icon_power_white.png" /> 366 <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file=" cros/icon_power_white.png" />
367 </if> 367 </if>
368 <structure type="chrome_scaled_image" name="IDR_INFO" file="common/info_sm all.png" /> 368 <structure type="chrome_scaled_image" name="IDR_INFO" file="common/info_sm all.png" />
369 <if expr="toolkit_views and not is_macosx"> 369 <if expr="(toolkit_views and not is_macosx) or mac_views_browser">
370 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM" file="common/infobarbutton_bottom_hover.png" /> 370 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM" file="common/infobarbutton_bottom_hover.png" />
371 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM_LEFT" file="common/infobarbutton_bottom_left_hover.png" /> 371 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM_LEFT" file="common/infobarbutton_bottom_left_hover.png" />
372 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM_RIGHT" file="common/infobarbutton_bottom_right_hover.png" /> 372 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM_RIGHT" file="common/infobarbutton_bottom_right_hover.png" />
373 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_CENT ER" file="common/infobarbutton_center_hover.png" /> 373 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_CENT ER" file="common/infobarbutton_center_hover.png" />
374 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_LEFT " file="common/infobarbutton_left_hover.png" /> 374 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_LEFT " file="common/infobarbutton_left_hover.png" />
375 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_RIGH T" file="common/infobarbutton_right_hover.png" /> 375 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_RIGH T" file="common/infobarbutton_right_hover.png" />
376 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP" file="common/infobarbutton_top_hover.png" /> 376 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP" file="common/infobarbutton_top_hover.png" />
377 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP_ LEFT" file="common/infobarbutton_top_left_hover.png" /> 377 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP_ LEFT" file="common/infobarbutton_top_left_hover.png" />
378 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP_ RIGHT" file="common/infobarbutton_top_right_hover.png" /> 378 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP_ RIGHT" file="common/infobarbutton_top_right_hover.png" />
379 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_MENU_DROPA RROW" file="common/infobarbutton_menu_droparrow.png" /> 379 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_MENU_DROPA RROW" file="common/infobarbutton_menu_droparrow.png" />
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="common/ash/theme_default_inactive.png" /> 1099 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="common/ash/theme_default_inactive.png" />
1100 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="common/ash/theme_default_inactive.png" /> 1100 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC OGNITO" file="common/ash/theme_default_inactive.png" />
1101 <if expr="not chromeos"> 1101 <if expr="not chromeos">
1102 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_D ESKTOP" file="theme_tab_background.png" /> 1102 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_D ESKTOP" file="theme_tab_background.png" />
1103 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I NCOGNITO_DESKTOP" file="theme_tab_background_incognito.png" /> 1103 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I NCOGNITO_DESKTOP" file="theme_tab_background_incognito.png" />
1104 </if> 1104 </if>
1105 </if> 1105 </if>
1106 <if expr="is_macosx or is_ios"> 1106 <if expr="is_macosx or is_ios">
1107 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="mac/theme_default_inactive.png" /> 1107 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi le="mac/theme_default_inactive.png" />
1108 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA CTIVE" file="mac/theme_default_inactive_background.png" /> 1108 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA CTIVE" file="mac/theme_default_inactive_background.png" />
1109 <if expr="mac_views_browser">
1110 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I NCOGNITO" file="mac/theme_default_inactive.png" />
1111 </if>
1109 </if> 1112 </if>
1110 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi le="theme_tab_background_glass.png" /> 1113 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi le="theme_tab_background_glass.png" />
1111 <if expr="not use_ash and not is_macosx and not is_ios"> 1114 <if expr="not use_ash and not is_macosx and not is_ios">
1112 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default.png" /> 1115 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the me_toolbar_default.png" />
1113 </if> 1116 </if>
1114 <if expr="use_ash"> 1117 <if expr="use_ash">
1115 <!-- Ash has a dark gray toolbar background, Windows has light gray. --> 1118 <!-- Ash has a dark gray toolbar background, Windows has light gray. -->
1116 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com mon/ash/theme_default_active.png" /> 1119 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com mon/ash/theme_default_active.png" />
1117 <if expr="not chromeos"> 1120 <if expr="not chromeos">
1118 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_DESKTOP" file="theme_toolbar_default.png" /> 1121 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_DESKTOP" file="theme_toolbar_default.png" />
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 <!-- People search images --> 1194 <!-- People search images -->
1192 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1195 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1193 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1196 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1194 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1197 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1195 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1198 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1196 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1199 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1197 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1200 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1198 </structures> 1201 </structures>
1199 </release> 1202 </release>
1200 </grit> 1203 </grit>
OLDNEW
« no previous file with comments | « build/secondary/tools/grit/grit_rule.gni ('k') | chrome/browser/ui/views/theme_image_mapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698