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

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

Issue 2001093002: Revert of Remove enable_topchrome_md build flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « chrome/app/theme/BUILD.gn ('k') | chrome/browser_tests.isolate » ('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.
11 --> 11 -->
12 <grit latest_public_release="0" current_release="1"> 12 <grit latest_public_release="0" current_release="1">
13 <outputs> 13 <outputs>
14 <output filename="grit/theme_resources.h" type="rc_header" context="default_ 100_percent"> 14 <output filename="grit/theme_resources.h" type="rc_header" context="default_ 100_percent">
15 <emit emit_type='prepend'></emit> 15 <emit emit_type='prepend'></emit>
16 </output> 16 </output>
17 <output filename="grit/theme_resources_map.cc" type="resource_map_source" co ntext="default_100_percent" /> 17 <output filename="grit/theme_resources_map.cc" type="resource_map_source" co ntext="default_100_percent" />
18 <output filename="grit/theme_resources_map.h" type="resource_map_header" con text="default_100_percent" /> 18 <output filename="grit/theme_resources_map.h" type="resource_map_header" con text="default_100_percent" />
19 <output filename="theme_resources_100_percent.pak" type="data_package" conte xt="default_100_percent" /> 19 <output filename="theme_resources_100_percent.pak" type="data_package" conte xt="default_100_percent" />
20 <output filename="theme_resources_200_percent.pak" type="data_package" conte xt="default_200_percent" /> 20 <output filename="theme_resources_200_percent.pak" type="data_package" conte xt="default_200_percent" />
21 <output filename="theme_resources_300_percent.pak" type="data_package" conte xt="default_300_percent" /> 21 <output filename="theme_resources_300_percent.pak" type="data_package" conte xt="default_300_percent" />
22 <if expr="is_macosx"> 22 <output filename="theme_resources_material_100_percent.pak" type="data_packa ge" context="material_100_percent" fallback_to_default_layout="false" />
23 <output filename="theme_resources_material_100_percent.pak" type="data_pac kage" context="material_100_percent" fallback_to_default_layout="false" /> 23 <output filename="theme_resources_material_200_percent.pak" type="data_packa ge" context="material_200_percent" fallback_to_default_layout="false" />
24 <output filename="theme_resources_material_200_percent.pak" type="data_pac kage" context="material_200_percent" fallback_to_default_layout="false" />
25 </if>
26 </outputs> 24 </outputs>
27 <release seq="1"> 25 <release seq="1">
28 <structures fallback_to_low_resolution="true"> 26 <structures fallback_to_low_resolution="true">
29 <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST 27 <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
30 BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE 28 BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
31 SAME CONDITIONALS. --> 29 SAME CONDITIONALS. -->
32 <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="co mmon/accessed_cookies.png" /> 30 <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="co mmon/accessed_cookies.png" />
33 <structure type="chrome_scaled_image" name="IDR_ALLOWED_BACKGROUND_SYNC" f ile="common/allowed_background_sync.png" /> 31 <structure type="chrome_scaled_image" name="IDR_ALLOWED_BACKGROUND_SYNC" f ile="common/allowed_background_sync.png" />
34 <structure type="chrome_scaled_image" name="IDR_ALLOWED_CAMERA" file="comm on/allowed_camera.png" /> 32 <structure type="chrome_scaled_image" name="IDR_ALLOWED_CAMERA" file="comm on/allowed_camera.png" />
35 <structure type="chrome_scaled_image" name="IDR_ALLOWED_DOWNLOADS" file="c ommon/allowed_downloads.png" /> 33 <structure type="chrome_scaled_image" name="IDR_ALLOWED_DOWNLOADS" file="c ommon/allowed_downloads.png" />
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 </if> 110 </if>
113 <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="comm on/blocked_popups.png" /> 111 <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="comm on/blocked_popups.png" />
114 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PPAPI_BROKER" file ="common/blocked_pepper_broker.png" /> 112 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PPAPI_BROKER" file ="common/blocked_pepper_broker.png" />
115 <structure type="chrome_scaled_image" name="IDR_BLOCKED_USB" file="common/ blocked_usb.png" /> 113 <structure type="chrome_scaled_image" name="IDR_BLOCKED_USB" file="common/ blocked_usb.png" />
116 <if expr="chromeos"> 114 <if expr="chromeos">
117 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file ="cros/bluetooth_pairing_keyboard.png" /> 115 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file ="cros/bluetooth_pairing_keyboard.png" />
118 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="c ros/bluetooth_pairing_mouse.png" /> 116 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="c ros/bluetooth_pairing_mouse.png" />
119 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" /> 117 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" />
120 </if> 118 </if>
121 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" /> 119 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c ommon/favicon_bookmarks.png" />
120 <if expr="is_macosx">
121 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" f ile="legacy/chevron.png" />
122 </if>
122 <if expr="is_macosx or is_ios"> 123 <if expr="is_macosx or is_ios">
123 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="mac/bookmark_bar_folder.png" /> 124 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="mac/bookmark_bar_folder.png" />
124 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" /> 125 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="mac/bookmark_bar_folder_managed.png" />
125 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="mac/bookmark_bar_folder_supervised.png" /> 126 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="mac/bookmark_bar_folder_supervised.png" />
126 </if> 127 <if expr="enable_topchrome_md">
127 <if expr="is_macosx"> 128 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_WH ITE" file="mac/bookmark_bar_folder_white.png" />
128 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" f ile="legacy/chevron.png" /> 129 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MA NAGED_WHITE" file="mac/bookmark_bar_folder_managed_white.png" />
129 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_WHIT E" file="mac/bookmark_bar_folder_white.png" /> 130 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SU PERVISED_WHITE" file="mac/bookmark_bar_folder_supervised_white.png" />
130 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED_WHITE" file="mac/bookmark_bar_folder_managed_white.png" /> 131 </if>
131 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED_WHITE" file="mac/bookmark_bar_folder_supervised_white.png" />
132 </if> 132 </if>
133 <if expr="not is_macosx and not is_ios"> 133 <if expr="not is_macosx and not is_ios">
134 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" /> 134 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="common/bookmark_bar_folder.png" />
135 </if> 135 </if>
136 <if expr="is_win"> 136 <if expr="is_win">
137 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="win/bookmark_bar_folder_managed.png" /> 137 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA GED" file="win/bookmark_bar_folder_managed.png" />
138 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="win/bookmark_bar_folder_supervised.png" /> 138 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_SUPE RVISED" file="win/bookmark_bar_folder_supervised.png" />
139 </if> 139 </if>
140 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" /> 140 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT " file="common/apps_bookmark_bar_icon.png" />
141 <if expr="chromeos"> 141 <if expr="chromeos">
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CALCULATOR_SELECTE D" file="common/omnibox_calculator_selected.png" /> 463 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CALCULATOR_SELECTE D" file="common/omnibox_calculator_selected.png" />
464 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM" file="common/omnibox_content_setting_bubble_bottom.png" /> 464 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM" file="common/omnibox_content_setting_bubble_bottom.png" />
465 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM_LEFT" file="common/omnibox_content_setting_bubble_bottom_left.png" / > 465 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM_LEFT" file="common/omnibox_content_setting_bubble_bottom_left.png" / >
466 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM_RIGHT" file="common/omnibox_content_setting_bubble_bottom_right.png" /> 466 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM_RIGHT" file="common/omnibox_content_setting_bubble_bottom_right.png" />
467 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_CENTER" file="common/omnibox_content_setting_bubble_center.png" /> 467 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_CENTER" file="common/omnibox_content_setting_bubble_center.png" />
468 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_LEFT" file="common/omnibox_content_setting_bubble_left.png" /> 468 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_LEFT" file="common/omnibox_content_setting_bubble_left.png" />
469 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_RIGHT" file="common/omnibox_content_setting_bubble_right.png" /> 469 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_RIGHT" file="common/omnibox_content_setting_bubble_right.png" />
470 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP" file="common/omnibox_content_setting_bubble_top.png" /> 470 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP" file="common/omnibox_content_setting_bubble_top.png" />
471 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP_LEFT" file="common/omnibox_content_setting_bubble_top_left.png" /> 471 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP_LEFT" file="common/omnibox_content_setting_bubble_top_left.png" />
472 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP_RIGHT" file="common/omnibox_content_setting_bubble_top_right.png" /> 472 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP_RIGHT" file="common/omnibox_content_setting_bubble_top_right.png" />
473 <if expr="toolkit_views"> 473 <if expr="enable_topchrome_md">
474 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_DROPDOWN_SHADOW_ BOTTOM" file="common/omnibox_dropdown_shadow_bottom.png" /> 474 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_DROPDOWN_SHADOW_ BOTTOM" file="common/omnibox_dropdown_shadow_bottom.png" />
475 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_DROPDOWN_SHADOW_ TOP" file="common/omnibox_dropdown_shadow_top.png" /> 475 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_DROPDOWN_SHADOW_ TOP" file="common/omnibox_dropdown_shadow_top.png" />
476 </if> 476 </if>
477 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BOTTOM" file="common/omnibox_ev_bubble_bottom.png" /> 477 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BOTTOM" file="common/omnibox_ev_bubble_bottom.png" />
478 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BOTTOM_L EFT" file="common/omnibox_ev_bubble_bottom_left.png" /> 478 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BOTTOM_L EFT" file="common/omnibox_ev_bubble_bottom_left.png" />
479 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BOTTOM_R IGHT" file="common/omnibox_ev_bubble_bottom_right.png" /> 479 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BOTTOM_R IGHT" file="common/omnibox_ev_bubble_bottom_right.png" />
480 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_CENTER" file="common/omnibox_ev_bubble_center.png" /> 480 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_CENTER" file="common/omnibox_ev_bubble_center.png" />
481 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_LEFT" fi le="common/omnibox_ev_bubble_left.png" /> 481 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_LEFT" fi le="common/omnibox_ev_bubble_left.png" />
482 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_RIGHT" f ile="common/omnibox_ev_bubble_right.png" /> 482 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_RIGHT" f ile="common/omnibox_ev_bubble_right.png" />
483 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_TOP" fil e="common/omnibox_ev_bubble_top.png" /> 483 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_TOP" fil e="common/omnibox_ev_bubble_top.png" />
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> 946 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" />
947 </if> 947 </if>
948 <if expr="is_macosx"> 948 <if expr="is_macosx">
949 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy /zoom_minus.png" /> 949 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy /zoom_minus.png" />
950 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/ zoom_plus.png" /> 950 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/ zoom_plus.png" />
951 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac y/zoom_reset.png" /> 951 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac y/zoom_reset.png" />
952 </if> 952 </if>
953 </structures> 953 </structures>
954 </release> 954 </release>
955 </grit> 955 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/BUILD.gn ('k') | chrome/browser_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698