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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7313017: Convert remaining instances of the 'os' variable in grit conditions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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/theme_resources.grd ('k') | chrome/app/theme/theme_resources_standard.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_large.h" type="rc_header"> 4 <output filename="grit/theme_resources_large.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_large_map.cc" type="resource_map_sour ce" /> 7 <output filename="grit/theme_resources_large_map.cc" type="resource_map_sour ce" />
8 <output filename="grit/theme_resources_large_map.h" type="resource_map_heade r" /> 8 <output filename="grit/theme_resources_large_map.h" type="resource_map_heade r" />
9 <output filename="theme_resources_large.pak" type="data_package" /> 9 <output filename="theme_resources_large.pak" type="data_package" />
10 <output filename="theme_resources_large.rc" type="rc_all" /> 10 <output filename="theme_resources_large.rc" type="rc_all" />
(...skipping 12 matching lines...) Expand all
23 <include name="IDR_BALLOON_WRENCH_P" file="large_notification_wrench_p.png " type="BINDATA" /> 23 <include name="IDR_BALLOON_WRENCH_P" file="large_notification_wrench_p.png " type="BINDATA" />
24 <include name="IDR_BLOCKED_COOKIES" file="large_blocked_cookies.png" type= "BINDATA" /> 24 <include name="IDR_BLOCKED_COOKIES" file="large_blocked_cookies.png" type= "BINDATA" />
25 <include name="IDR_BLOCKED_IMAGES" file="large_blocked_images.png" type="B INDATA" /> 25 <include name="IDR_BLOCKED_IMAGES" file="large_blocked_images.png" type="B INDATA" />
26 <include name="IDR_BLOCKED_JAVASCRIPT" file="large_blocked_script.png" typ e="BINDATA" /> 26 <include name="IDR_BLOCKED_JAVASCRIPT" file="large_blocked_script.png" typ e="BINDATA" />
27 <include name="IDR_BLOCKED_PLUGINS" file="large_blocked_plugins.png" type= "BINDATA" /> 27 <include name="IDR_BLOCKED_PLUGINS" file="large_blocked_plugins.png" type= "BINDATA" />
28 <include name="IDR_BLOCKED_POPUPS" file="large_blocked_popups.png" type="B INDATA" /> 28 <include name="IDR_BLOCKED_POPUPS" file="large_blocked_popups.png" type="B INDATA" />
29 <include name="IDR_BOOKMARKS_FAVICON" file="large_bookmarks_favicon.png" t ype="BINDATA" /> 29 <include name="IDR_BOOKMARKS_FAVICON" file="large_bookmarks_favicon.png" t ype="BINDATA" />
30 <include name="IDR_BROWSER_ACTION" file="large_browser_action.png" type="B INDATA" /> 30 <include name="IDR_BROWSER_ACTION" file="large_browser_action.png" type="B INDATA" />
31 <include name="IDR_BROWSER_ACTION_H" file="large_browser_action_h.png" typ e="BINDATA" /> 31 <include name="IDR_BROWSER_ACTION_H" file="large_browser_action_h.png" typ e="BINDATA" />
32 <include name="IDR_BROWSER_ACTION_P" file="large_browser_action_p.png" typ e="BINDATA" /> 32 <include name="IDR_BROWSER_ACTION_P" file="large_browser_action_p.png" typ e="BINDATA" />
33 <if expr="os.find('win') == -1"> 33 <if expr="not is_win">
34 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="large_browser_actions _overflow.png" type="BINDATA" /> 34 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="large_browser_actions _overflow.png" type="BINDATA" />
35 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="large_browser_actio ns_overflow_h.png" type="BINDATA" /> 35 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="large_browser_actio ns_overflow_h.png" type="BINDATA" />
36 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="large_browser_actio ns_overflow_p.png" type="BINDATA" /> 36 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="large_browser_actio ns_overflow_p.png" type="BINDATA" />
37 </if> 37 </if>
38 <if expr="os.find('win') != -1"> 38 <if expr="is_win">
39 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low_win.png" type="BINDATA" /> 39 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low_win.png" type="BINDATA" />
40 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_win_h.png" type="BINDATA" /> 40 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_win_h.png" type="BINDATA" />
41 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_win_p.png" type="BINDATA" /> 41 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_win_p.png" type="BINDATA" />
42 </if> 42 </if>
43 <include name="IDR_BUBBLE_B" file="large_bubble_b.png" type="BINDATA" /> 43 <include name="IDR_BUBBLE_B" file="large_bubble_b.png" type="BINDATA" />
44 <include name="IDR_BUBBLE_BL" file="large_bubble_bl.png" type="BINDATA" /> 44 <include name="IDR_BUBBLE_BL" file="large_bubble_bl.png" type="BINDATA" />
45 <include name="IDR_BUBBLE_BR" file="large_bubble_br.png" type="BINDATA" /> 45 <include name="IDR_BUBBLE_BR" file="large_bubble_br.png" type="BINDATA" />
46 <include name="IDR_BUBBLE_B_ARROW" file="large_bubble_pointer_b.png" type= "BINDATA" /> 46 <include name="IDR_BUBBLE_B_ARROW" file="large_bubble_pointer_b.png" type= "BINDATA" />
47 <include name="IDR_BUBBLE_L" file="large_bubble_l.png" type="BINDATA" /> 47 <include name="IDR_BUBBLE_L" file="large_bubble_l.png" type="BINDATA" />
48 <include name="IDR_BUBBLE_L_ARROW" file="large_bubble_pointer_l.png" type= "BINDATA" /> 48 <include name="IDR_BUBBLE_L_ARROW" file="large_bubble_pointer_l.png" type= "BINDATA" />
49 <include name="IDR_BUBBLE_R" file="large_bubble_r.png" type="BINDATA" /> 49 <include name="IDR_BUBBLE_R" file="large_bubble_r.png" type="BINDATA" />
50 <include name="IDR_BUBBLE_R_ARROW" file="large_bubble_pointer_r.png" type= "BINDATA" /> 50 <include name="IDR_BUBBLE_R_ARROW" file="large_bubble_pointer_r.png" type= "BINDATA" />
51 <include name="IDR_BUBBLE_T" file="large_bubble_t.png" type="BINDATA" /> 51 <include name="IDR_BUBBLE_T" file="large_bubble_t.png" type="BINDATA" />
52 <include name="IDR_BUBBLE_TL" file="large_bubble_tl.png" type="BINDATA" /> 52 <include name="IDR_BUBBLE_TL" file="large_bubble_tl.png" type="BINDATA" />
53 <include name="IDR_BUBBLE_TR" file="large_bubble_tr.png" type="BINDATA" /> 53 <include name="IDR_BUBBLE_TR" file="large_bubble_tr.png" type="BINDATA" />
54 <include name="IDR_BUBBLE_T_ARROW" file="large_bubble_pointer_t.png" type= "BINDATA" /> 54 <include name="IDR_BUBBLE_T_ARROW" file="large_bubble_pointer_t.png" type= "BINDATA" />
55 <include name="IDR_CLOSE_BAR" file="large_close_bar.png" type="BINDATA" /> 55 <include name="IDR_CLOSE_BAR" file="large_close_bar.png" type="BINDATA" />
56 <include name="IDR_CLOSE_BAR_H" file="large_close_bar_h.png" type="BINDATA " /> 56 <include name="IDR_CLOSE_BAR_H" file="large_close_bar_h.png" type="BINDATA " />
57 <include name="IDR_CLOSE_BAR_MASK" file="large_close_bar_mask.png" type="B INDATA" /> 57 <include name="IDR_CLOSE_BAR_MASK" file="large_close_bar_mask.png" type="B INDATA" />
58 <include name="IDR_CLOSE_BAR_P" file="large_close_bar_p.png" type="BINDATA " /> 58 <include name="IDR_CLOSE_BAR_P" file="large_close_bar_p.png" type="BINDATA " />
59 <if expr="os.find('win') != -1"> 59 <if expr="is_win">
60 <include name="IDR_CONFLICT_FAVICON" file="large_about_conflicts_favicon .png" type="BINDATA" /> 60 <include name="IDR_CONFLICT_FAVICON" file="large_about_conflicts_favicon .png" type="BINDATA" />
61 </if> 61 </if>
62 <include name="IDR_CONTENT_TOP_CENTER" file="large_content_top_center.png" type="BINDATA" /> 62 <include name="IDR_CONTENT_TOP_CENTER" file="large_content_top_center.png" type="BINDATA" />
63 <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="large_content_top_left_c orner.png" type="BINDATA" /> 63 <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="large_content_top_left_c orner.png" type="BINDATA" />
64 <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="large_content_top_l eft_corner_mask.png" type="BINDATA" /> 64 <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="large_content_top_l eft_corner_mask.png" type="BINDATA" />
65 <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="large_content_top_right _corner.png" type="BINDATA" /> 65 <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="large_content_top_right _corner.png" type="BINDATA" />
66 <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="large_content_top_ right_corner_mask.png" type="BINDATA" /> 66 <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="large_content_top_ right_corner_mask.png" type="BINDATA" />
67 <include name="IDR_DOWNLOADS_FAVICON" file="large_downloads_favicon.png" t ype="BINDATA" /> 67 <include name="IDR_DOWNLOADS_FAVICON" file="large_downloads_favicon.png" t ype="BINDATA" />
68 <include name="IDR_FEEDBACK" file="large_feedback.png" type="BINDATA" /> 68 <include name="IDR_FEEDBACK" file="large_feedback.png" type="BINDATA" />
69 <include name="IDR_FEEDBACK_H" file="large_feedback_h.png" type="BINDATA" /> 69 <include name="IDR_FEEDBACK_H" file="large_feedback_h.png" type="BINDATA" />
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 </if> 121 </if>
122 <if expr="not pp_ifdef('chromeos')"> 122 <if expr="not pp_ifdef('chromeos')">
123 <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BIN DATA" /> 123 <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BIN DATA" />
124 </if> 124 </if>
125 <if expr="pp_ifdef('chromeos')"> 125 <if expr="pp_ifdef('chromeos')">
126 <include name="IDR_THEME_TAB_BACKGROUND" file="large_theme_tab_backgroun d2.png" type="BINDATA" /> 126 <include name="IDR_THEME_TAB_BACKGROUND" file="large_theme_tab_backgroun d2.png" type="BINDATA" />
127 </if> 127 </if>
128 <if expr="not pp_ifdef('chromeos')"> 128 <if expr="not pp_ifdef('chromeos')">
129 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" /> 129 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
130 </if> 130 </if>
131 <if expr="pp_ifdef('chromeos') or os == 'darwin'"> 131 <if expr="pp_ifdef('chromeos') or is_macosx">
132 <include name="IDR_THEME_TOOLBAR" file="large_theme_toolbar_default2.png " type="BINDATA" /> 132 <include name="IDR_THEME_TOOLBAR" file="large_theme_toolbar_default2.png " type="BINDATA" />
133 </if> 133 </if>
134 <if expr="not pp_ifdef('chromeos') and os != 'darwin'"> 134 <if expr="not pp_ifdef('chromeos') and not is_macosx">
135 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" /> 135 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" />
136 </if> 136 </if>
137 <if expr="os == 'darwin'"> 137 <if expr="is_macosx">
138 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="large_theme_toolbar_def ault_inactive2.png" type="BINDATA" /> 138 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="large_theme_toolbar_def ault_inactive2.png" type="BINDATA" />
139 </if> 139 </if>
140 <include name="IDR_THROBBER_WAITING" file="large_throbber_waiting.png" typ e="BINDATA" /> 140 <include name="IDR_THROBBER_WAITING" file="large_throbber_waiting.png" typ e="BINDATA" />
141 <include name="IDR_TOOLS" file="large_tools.png" type="BINDATA" /> 141 <include name="IDR_TOOLS" file="large_tools.png" type="BINDATA" />
142 <include name="IDR_TOOLS_H" file="large_tools_h.png" type="BINDATA" /> 142 <include name="IDR_TOOLS_H" file="large_tools_h.png" type="BINDATA" />
143 <include name="IDR_TOOLS_P" file="large_tools_p.png" type="BINDATA" /> 143 <include name="IDR_TOOLS_P" file="large_tools_p.png" type="BINDATA" />
144 </includes> 144 </includes>
145 </release> 145 </release>
146 </grit> 146 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/app/theme/theme_resources_standard.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698