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

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

Issue 10828002: (Views only) Replace the content settings icons on the Website Settings UI with the new icons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on tot. Created 8 years, 4 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 | « no previous file | chrome/browser/ui/website_settings/website_settings_ui.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 <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" context="default_ 100_percent"> 4 <output filename="grit/theme_resources.h" type="rc_header" context="default_ 100_percent">
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" co ntext="default_100_percent" /> 7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" co ntext="default_100_percent" />
8 <output filename="grit/theme_resources_map.h" type="resource_map_header" con text="default_100_percent" /> 8 <output filename="grit/theme_resources_map.h" type="resource_map_header" con text="default_100_percent" />
9 <output filename="theme_resources_100_percent.pak" type="data_package" conte xt="default_100_percent" /> 9 <output filename="theme_resources_100_percent.pak" type="data_package" conte xt="default_100_percent" />
10 <output filename="theme_resources_200_percent.pak" type="data_package" conte xt="default_200_percent" /> 10 <output filename="theme_resources_200_percent.pak" type="data_package" conte xt="default_200_percent" />
11 <output filename="theme_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" /> 11 <output filename="theme_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
12 <output filename="theme_resources_touch_200_percent.pak" type="data_package" context="touch_200_percent" /> 12 <output filename="theme_resources_touch_200_percent.pak" type="data_package" context="touch_200_percent" />
13 <output filename="theme_resources_100_percent.rc" type="rc_all" context="def ault_100_percent" /> 13 <output filename="theme_resources_100_percent.rc" type="rc_all" context="def ault_100_percent" />
14 </outputs> 14 </outputs>
15 <release seq="1"> 15 <release seq="1">
16 <structures fallback_to_low_resolution="true"> 16 <structures fallback_to_low_resolution="true">
17 <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST 17 <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
18 BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE 18 BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
19 SAME CONDITIONALS. --> 19 SAME CONDITIONALS. -->
20 <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="ac cessed_cookies.png" /> 20 <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="ac cessed_cookies.png" />
21 <if expr="pp_ifdef('chromeos')"> 21 <if expr="pp_ifdef('chromeos')">
22 <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_ICON" file ="accessibility_icon.png" /> 22 <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_ICON" file ="accessibility_icon.png" />
23 </if> 23 </if>
24 <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON" file="a ction_box_button.png" /> 24 <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON" file="a ction_box_button.png" />
25 <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON_PRESSED" file="action_box_button_pressed.png" /> 25 <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON_PRESSED" file="action_box_button_pressed.png" />
26 <structure type="chrome_scaled_image" name="IDR_ALLOWED_FULLSCREEN" file=" allowed_fullscreen.png" />
27 <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="allo wed_images.png" />
28 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MOUSE_CURSOR" file ="allowed_mouse_cursor.png" />
29 <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file ="allowed_notifications.png" />
30 <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="allo wed_popups.png" />
31 <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="all owed_plugins.png" />
32 <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file=" allowed_script.png" />
26 <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="ap p_default_icon.png" /> 33 <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="ap p_default_icon.png" />
27 <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="app_d roparrow.png" /> 34 <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="app_d roparrow.png" />
28 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB" file ="nub.png" /> 35 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB" file ="nub.png" />
29 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" /> 36 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" />
30 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_SMALL_BUB BLE" file="small_bubble.png" /> 37 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_SMALL_BUB BLE" file="small_bubble.png" />
38 <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA" file="ask_media .png" />
31 <if expr="not pp_ifdef('toolkit_views')"> 39 <if expr="not pp_ifdef('toolkit_views')">
32 <structure type="chrome_scaled_image" name="IDR_BACK" file="back.png" /> 40 <structure type="chrome_scaled_image" name="IDR_BACK" file="back.png" />
33 <structure type="chrome_scaled_image" name="IDR_BACK_D" file="back_disab led.png" /> 41 <structure type="chrome_scaled_image" name="IDR_BACK_D" file="back_disab led.png" />
34 <structure type="chrome_scaled_image" name="IDR_BACK_H" file="back_hover .png" /> 42 <structure type="chrome_scaled_image" name="IDR_BACK_H" file="back_hover .png" />
35 <structure type="chrome_scaled_image" name="IDR_BACK_P" file="back_press ed.png" /> 43 <structure type="chrome_scaled_image" name="IDR_BACK_P" file="back_press ed.png" />
36 </if> 44 </if>
37 <!-- TODO(jamescook): Update all Chrome platforms to use the new art and m etrics 45 <!-- TODO(jamescook): Update all Chrome platforms to use the new art and m etrics
38 from Ash, crbug.com/118228 --> 46 from Ash, crbug.com/118228 -->
39 <if expr="pp_ifdef('toolkit_views')"> 47 <if expr="pp_ifdef('toolkit_views')">
40 <structure type="chrome_scaled_image" name="IDR_BACK" file="ash/browser_ back_normal.png" /> 48 <structure type="chrome_scaled_image" name="IDR_BACK" file="ash/browser_ back_normal.png" />
41 <structure type="chrome_scaled_image" name="IDR_BACK_D" file="ash/browse r_back_disabled.png" /> 49 <structure type="chrome_scaled_image" name="IDR_BACK_D" file="ash/browse r_back_disabled.png" />
42 <structure type="chrome_scaled_image" name="IDR_BACK_H" file="ash/browse r_back_hover.png" /> 50 <structure type="chrome_scaled_image" name="IDR_BACK_H" file="ash/browse r_back_hover.png" />
43 <structure type="chrome_scaled_image" name="IDR_BACK_P" file="ash/browse r_back_pressed.png" /> 51 <structure type="chrome_scaled_image" name="IDR_BACK_P" file="ash/browse r_back_pressed.png" />
44 </if> 52 </if>
45 <structure type="chrome_scaled_image" name="IDR_BALLOON_CLOSE" file="ballo on_close.png" /> 53 <structure type="chrome_scaled_image" name="IDR_BALLOON_CLOSE" file="ballo on_close.png" />
46 <structure type="chrome_scaled_image" name="IDR_BALLOON_CLOSE_HOVER" file= "balloon_close_hover.png" /> 54 <structure type="chrome_scaled_image" name="IDR_BALLOON_CLOSE_HOVER" file= "balloon_close_hover.png" />
47 <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH" file="noti fication_wrench.png" /> 55 <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH" file="noti fication_wrench.png" />
48 <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_H" file="no tification_wrench_hover.png" /> 56 <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_H" file="no tification_wrench_hover.png" />
49 <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_P" file="no tification_wrench_pressed.png" /> 57 <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_P" file="no tification_wrench_pressed.png" />
50 <structure type="chrome_scaled_image" name="IDR_BLOCKED_COOKIES" file="blo cked_cookies.png" /> 58 <structure type="chrome_scaled_image" name="IDR_BLOCKED_COOKIES" file="blo cked_cookies.png" />
59 <structure type="chrome_scaled_image" name="IDR_BLOCKED_FULLSCREEN" file=" blocked_fullscreen.png" />
51 <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="bloc ked_images.png" /> 60 <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="bloc ked_images.png" />
52 <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file=" blocked_script.png" /> 61 <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file=" blocked_script.png" />
62 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MEDIA" file="block ed_media.png" />
63 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MOUSE_CURSOR" file ="blocked_mouse_cursor.png" />
53 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIXED_CONTENT" fil e="blocked_mixed_content.png" /> 64 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIXED_CONTENT" fil e="blocked_mixed_content.png" />
65 <structure type="chrome_scaled_image" name="IDR_BLOCKED_NOTIFICATION" file ="blocked_notifications.png" />
54 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="blo cked_plugins.png" /> 66 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="blo cked_plugins.png" />
55 <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="bloc ked_popups.png" /> 67 <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="bloc ked_popups.png" />
56 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="b ookmarks_favicon.png" /> 68 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="b ookmarks_favicon.png" />
57 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="chevron.png" /> 69 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" fil e="chevron.png" />
58 <if expr="is_macosx"> 70 <if expr="is_macosx">
59 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="bookmark_bar_folder_mac.png" /> 71 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="bookmark_bar_folder_mac.png" />
60 </if> 72 </if>
61 <if expr="not is_macosx"> 73 <if expr="not is_macosx">
62 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="bookmark_bar_folder.png" /> 74 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil e="bookmark_bar_folder.png" />
63 </if> 75 </if>
(...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 <if expr="not is_macosx"> 866 <if expr="not is_macosx">
855 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" /> 867 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" />
856 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" /> 868 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" />
857 </if> 869 </if>
858 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" /> 870 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" />
859 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> 871 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
860 </if> 872 </if>
861 </includes> 873 </includes>
862 </release> 874 </release>
863 </grit> 875 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698