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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9707001: Ash: Use new toolbar buttons, adjust spacing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add TODO Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/views/location_bar/location_bar_view.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_standard.h" type="rc_header"> 4 <output filename="grit/theme_resources_standard.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_standard_map.cc" type="resource_map_s ource" /> 7 <output filename="grit/theme_resources_standard_map.cc" type="resource_map_s ource" />
8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" /> 8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" />
9 <output filename="theme_resources_standard.pak" type="data_package" /> 9 <output filename="theme_resources_standard.pak" type="data_package" />
10 <output filename="theme_resources_standard.rc" type="rc_all" /> 10 <output filename="theme_resources_standard.rc" type="rc_all" />
11 </outputs> 11 </outputs>
12 <release seq="1"> 12 <release seq="1">
13 <includes> 13 <includes>
14 <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH 14 <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
15 theme_resources_2x.grd. THIS MEANS THAT EACH ICON IN THIS FILE 15 theme_resources_2x.grd. THIS MEANS THAT EACH ICON IN THIS FILE
16 MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.--> 16 MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
17 <include name="IDR_APP_NOTIFICATION_NUB" file="nub.png" type="BINDATA" /> 17 <include name="IDR_APP_NOTIFICATION_NUB" file="nub.png" type="BINDATA" />
18 <include name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" type="BI NDATA" /> 18 <include name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" type="BI NDATA" />
19 <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.png" type="BINDATA" /> 19 <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.png" type="BINDATA" />
20 <include name="IDR_BACK" file="back.png" type="BINDATA" /> 20 <!-- TODO(jamescook): Update all Chrome platforms to use the new art and m etrics
21 <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" /> 21 from Ash, crbug.com/118228 -->
22 <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" /> 22 <if expr="pp_ifdef('use_ash')">
23 <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" /> 23 <include name="IDR_BACK" file="ash/browser_back_normal.png" type="BINDAT A" />
24 <include name="IDR_BACK_D" file="ash/browser_back_disabled.png" type="BI NDATA" />
25 <include name="IDR_BACK_H" file="ash/browser_back_hot.png" type="BINDATA " />
26 <include name="IDR_BACK_P" file="ash/browser_back_pressed.png" type="BIN DATA" />
27 </if>
28 <if expr="not pp_ifdef('use_ash')">
29 <include name="IDR_BACK" file="back.png" type="BINDATA" />
30 <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
31 <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
32 <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" />
33 </if>
24 <include name="IDR_BALLOON_WRENCH" file="notification_wrench.png" type="BI NDATA" /> 34 <include name="IDR_BALLOON_WRENCH" file="notification_wrench.png" type="BI NDATA" />
25 <include name="IDR_BALLOON_WRENCH_H" file="notification_wrench_h.png" type ="BINDATA" /> 35 <include name="IDR_BALLOON_WRENCH_H" file="notification_wrench_h.png" type ="BINDATA" />
26 <include name="IDR_BALLOON_WRENCH_P" file="notification_wrench_p.png" type ="BINDATA" /> 36 <include name="IDR_BALLOON_WRENCH_P" file="notification_wrench_p.png" type ="BINDATA" />
27 <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDA TA" /> 37 <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDA TA" />
28 <include name="IDR_BLOCKED_IMAGES" file="blocked_images.png" type="BINDATA " /> 38 <include name="IDR_BLOCKED_IMAGES" file="blocked_images.png" type="BINDATA " />
29 <include name="IDR_BLOCKED_JAVASCRIPT" file="blocked_script.png" type="BIN DATA" /> 39 <include name="IDR_BLOCKED_JAVASCRIPT" file="blocked_script.png" type="BIN DATA" />
30 <include name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" type="BINDA TA" /> 40 <include name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" type="BINDA TA" />
31 <include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA " /> 41 <include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA " />
32 <include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" type="B INDATA" /> 42 <include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" type="B INDATA" />
33 <include name="IDR_BROWSER_ACTION" file="browser_action.png" type="BINDATA " /> 43 <if expr="pp_ifdef('use_ash')">
34 <include name="IDR_BROWSER_ACTION_H" file="browser_action_h.png" type="BIN DATA" /> 44 <include name="IDR_BROWSER_ACTION" file="ash/browser_action_normal.png" type="BINDATA" />
35 <include name="IDR_BROWSER_ACTION_P" file="browser_action_p.png" type="BIN DATA" /> 45 <include name="IDR_BROWSER_ACTION_H" file="ash/browser_action_hot.png" t ype="BINDATA" />
36 <if expr="not is_win"> 46 <include name="IDR_BROWSER_ACTION_P" file="ash/browser_action_pressed.pn g" type="BINDATA" />
47 </if>
48 <if expr="not pp_ifdef('use_ash')">
49 <include name="IDR_BROWSER_ACTION" file="browser_action.png" type="BINDA TA" />
50 <include name="IDR_BROWSER_ACTION_H" file="browser_action_h.png" type="B INDATA" />
51 <include name="IDR_BROWSER_ACTION_P" file="browser_action_p.png" type="B INDATA" />
52 </if>
53 <if expr="pp_ifdef('use_ash')">
54 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="ash/browser_actions_o verflow_normal.png" type="BINDATA" />
55 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="ash/browser_actions _overflow_hot.png" type="BINDATA" />
56 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="ash/browser_actions _overflow_pressed.png" type="BINDATA" />
57 </if>
58 <if expr="not is_win and not pp_ifdef('use_ash')">
37 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low.png" type="BINDATA" /> 59 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low.png" type="BINDATA" />
38 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_h.png" type="BINDATA" /> 60 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_h.png" type="BINDATA" />
39 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_p.png" type="BINDATA" /> 61 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_p.png" type="BINDATA" />
40 </if> 62 </if>
41 <if expr="is_win"> 63 <if expr="is_win and not pp_ifdef('use_ash')">
42 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low_win.png" type="BINDATA" /> 64 <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overf low_win.png" type="BINDATA" />
43 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_win_h.png" type="BINDATA" /> 65 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_ove rflow_win_h.png" type="BINDATA" />
44 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_win_p.png" type="BINDATA" /> 66 <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_ove rflow_win_p.png" type="BINDATA" />
45 </if> 67 </if>
46 <if expr="is_win"> 68 <if expr="is_win">
47 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" /> 69 <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" />
48 </if> 70 </if>
49 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" /> 71 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" />
50 <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner. png" type="BINDATA" /> 72 <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner. png" type="BINDATA" />
51 <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_co rner_mask.png" type="BINDATA" /> 73 <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_co rner_mask.png" type="BINDATA" />
52 <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corne r.png" type="BINDATA" /> 74 <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corne r.png" type="BINDATA" />
53 <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_ corner_mask.png" type="BINDATA" /> 75 <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_ corner_mask.png" type="BINDATA" />
54 <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="B INDATA" /> 76 <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="B INDATA" />
55 <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" /> 77 <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" />
56 <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" /> 78 <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" />
57 <include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" /> 79 <include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" />
58 <include name="IDR_FLAGS" file="flags.png" type="BINDATA" /> 80 <include name="IDR_FLAGS" file="flags.png" type="BINDATA" />
59 <include name="IDR_FORWARD" file="forward.png" type="BINDATA" /> 81 <if expr="pp_ifdef('use_ash')">
60 <include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" /> 82 <include name="IDR_FORWARD" file="ash/browser_forward_normal.png" type=" BINDATA" />
61 <include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" /> 83 <include name="IDR_FORWARD_D" file="ash/browser_forward_disabled.png" ty pe="BINDATA" />
62 <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" /> 84 <include name="IDR_FORWARD_H" file="ash/browser_forward_hot.png" type="B INDATA" />
85 <include name="IDR_FORWARD_P" file="ash/browser_forward_pressed.png" typ e="BINDATA" />
86 </if>
87 <if expr="not pp_ifdef('use_ash')">
88 <include name="IDR_FORWARD" file="forward.png" type="BINDATA" />
89 <include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" />
90 <include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" />
91 <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" />
92 </if>
63 <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png " type="BINDATA" /> 93 <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png " type="BINDATA" />
64 <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDA TA" /> 94 <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDA TA" />
65 <include name="IDR_HOME" file="home.png" type="BINDATA" /> 95 <if expr="pp_ifdef('use_ash')">
66 <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" /> 96 <include name="IDR_HOME" file="ash/browser_home_normal.png" type="BINDAT A" />
67 <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" /> 97 <include name="IDR_HOME_H" file="ash/browser_home_hot.png" type="BINDATA " />
98 <include name="IDR_HOME_P" file="ash/browser_home_pressed.png" type="BIN DATA" />
99 </if>
100 <if expr="not pp_ifdef('use_ash')">
101 <include name="IDR_HOME" file="home.png" type="BINDATA" />
102 <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
103 <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
104 </if>
68 <include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type ="BINDATA" /> 105 <include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type ="BINDATA" />
69 <include name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" type="BIN DATA" /> 106 <include name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" type="BIN DATA" />
70 <include name="IDR_INFOBAR_AUTOLOGIN" file="infobar_autologin.png" type="B INDATA" /> 107 <include name="IDR_INFOBAR_AUTOLOGIN" file="infobar_autologin.png" type="B INDATA" />
71 <include name="IDR_INFOBAR_COOKIE" file="infobar_cookie.png" type="BINDATA " /> 108 <include name="IDR_INFOBAR_COOKIE" file="infobar_cookie.png" type="BINDATA " />
72 <include name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="infobar_desktop_no tifications.png" type="BINDATA" /> 109 <include name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="infobar_desktop_no tifications.png" type="BINDATA" />
73 <include name="IDR_INFOBAR_INCOMPLETE" file="infobar_incomplete.png" type= "BINDATA" /> 110 <include name="IDR_INFOBAR_INCOMPLETE" file="infobar_incomplete.png" type= "BINDATA" />
74 <include name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="infobar_camera.png" type="BINDATA" /> 111 <include name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="infobar_camera.png" type="BINDATA" />
75 <include name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="infobar_microphone.png" type="BINDATA" /> 112 <include name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="infobar_microphone.png" type="BINDATA" />
76 <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_down loads.png" type="BINDATA" /> 113 <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_down loads.png" type="BINDATA" />
77 <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.pn g" type="BINDATA" /> 114 <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.pn g" type="BINDATA" />
78 <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type= "BINDATA" /> 115 <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type= "BINDATA" />
79 <include name="IDR_INFOBAR_QUESTION_MARK" file="infobar_questionmark.png" type="BINDATA" /> 116 <include name="IDR_INFOBAR_QUESTION_MARK" file="infobar_questionmark.png" type="BINDATA" />
80 <include name="IDR_INFOBAR_RESTORE_SESSION" file="infobar_restore.png" typ e="BINDATA" /> 117 <include name="IDR_INFOBAR_RESTORE_SESSION" file="infobar_restore.png" typ e="BINDATA" />
81 <include name="IDR_INFOBAR_SAVE_PASSWORD" file="infobar_savepassword.png" type="BINDATA" /> 118 <include name="IDR_INFOBAR_SAVE_PASSWORD" file="infobar_savepassword.png" type="BINDATA" />
82 <include name="IDR_INFOBAR_SSL_WARNING" file="infobar_insecure.png" type=" BINDATA" /> 119 <include name="IDR_INFOBAR_SSL_WARNING" file="infobar_insecure.png" type=" BINDATA" />
83 <include name="IDR_INFOBAR_SYNC" file="infobar_sync.png" type="BINDATA" /> 120 <include name="IDR_INFOBAR_SYNC" file="infobar_sync.png" type="BINDATA" />
84 <include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" /> 121 <include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" />
85 <include name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.png" type="B INDATA" /> 122 <include name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.png" type="B INDATA" />
86 <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifie r.png" type="BINDATA" /> 123 <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifie r.png" type="BINDATA" />
87 <include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" /> 124 <if expr="pp_ifdef('use_ash')">
88 <include name="IDR_LOCATIONBG_L" file="omnibox_l.png" type="BINDATA" /> 125 <include name="IDR_LOCATIONBG_C" file="ash/browser_omnibox_middle.png" t ype="BINDATA" />
89 <include name="IDR_LOCATIONBG_R" file="omnibox_r.png" type="BINDATA" /> 126 <include name="IDR_LOCATIONBG_L" file="ash/browser_omnibox_left.png" typ e="BINDATA" />
90 <include name="IDR_LOCATION_BAR_BORDER" file="omnibox_border.png" type="BI NDATA" /> 127 <include name="IDR_LOCATIONBG_R" file="ash/browser_omnibox_right.png" ty pe="BINDATA" />
128 <include name="IDR_LOCATION_BAR_BORDER" file="ash/browser_omnibox_border .png" type="BINDATA" />
129 </if>
130 <if expr="not pp_ifdef('use_ash')">
131 <include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" />
132 <include name="IDR_LOCATIONBG_L" file="omnibox_l.png" type="BINDATA" />
133 <include name="IDR_LOCATIONBG_R" file="omnibox_r.png" type="BINDATA" />
134 <include name="IDR_LOCATION_BAR_BORDER" file="omnibox_border.png" type=" BINDATA" />
135 </if>
91 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keywo rd_search_bubble_c.png" type="BINDATA" /> 136 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keywo rd_search_bubble_c.png" type="BINDATA" />
92 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keywo rd_search_bubble_l.png" type="BINDATA" /> 137 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keywo rd_search_bubble_l.png" type="BINDATA" />
93 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keywo rd_search_bubble_r.png" type="BINDATA" /> 138 <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keywo rd_search_bubble_r.png" type="BINDATA" />
94 <include name="IDR_MOBILE" file="mobile.png" type="BINDATA" /> 139 <include name="IDR_MOBILE" file="mobile.png" type="BINDATA" />
95 <include name="IDR_MOBILE_LIT" file="mobile_lit.png" type="BINDATA" /> 140 <include name="IDR_MOBILE_LIT" file="mobile_lit.png" type="BINDATA" />
96 <if expr="pp_ifdef('toolkit_views')"> 141 <if expr="pp_ifdef('toolkit_views')">
97 <include name="IDR_NEWTAB_BUTTON" file="newtab_views.png" type="BINDATA" /> 142 <include name="IDR_NEWTAB_BUTTON" file="newtab_views.png" type="BINDATA" />
98 <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p_views.png" type="BIND ATA" /> 143 <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p_views.png" type="BIND ATA" />
99 </if> 144 </if>
100 <if expr="not pp_ifdef('toolkit_views')"> 145 <if expr="not pp_ifdef('toolkit_views')">
101 <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" /> 146 <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
102 <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" / > 147 <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" / >
103 <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" / > 148 <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" / >
104 </if> 149 </if>
105 <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type= "BINDATA" /> 150 <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type= "BINDATA" />
106 <include name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" type="BIN DATA" /> 151 <include name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" type="BIN DATA" />
107 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" type="BINDATA" /> 152 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" type="BINDATA" />
108 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" type="BINDATA" /> 153 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" type="BINDATA" />
109 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r.png" type="BINDATA" /> 154 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r.png" type="BINDATA" />
110 <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" /> 155 <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" />
111 <include name="IDR_RELOAD" file="reload.png" type="BINDATA" /> 156 <if expr="pp_ifdef('use_ash')">
112 <include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" /> 157 <include name="IDR_RELOAD" file="ash/browser_reload_normal.png" type="BI NDATA" />
113 <include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" /> 158 <include name="IDR_RELOAD_H" file="ash/browser_reload_hot.png" type="BIN DATA" />
159 <include name="IDR_RELOAD_P" file="ash/browser_reload_pressed.png" type= "BINDATA" />
160 </if>
161 <if expr="not pp_ifdef('use_ash')">
162 <include name="IDR_RELOAD" file="reload.png" type="BINDATA" />
163 <include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" />
164 <include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" />
165 </if>
114 <include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" /> 166 <include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" />
115 <include name="IDR_STAR" file="star.png" type="BINDATA" /> 167 <include name="IDR_STAR" file="star.png" type="BINDATA" />
116 <include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" /> 168 <include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" />
117 <include name="IDR_STOP" file="stop.png" type="BINDATA" /> 169 <if expr="pp_ifdef('use_ash')">
118 <include name="IDR_STOP_D" file="stop_d.png" type="BINDATA" /> 170 <include name="IDR_STOP" file="ash/browser_stop_normal.png" type="BINDAT A" />
119 <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" /> 171 <include name="IDR_STOP_D" file="ash/browser_stop_disabled.png" type="BI NDATA" />
120 <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" /> 172 <include name="IDR_STOP_H" file="ash/browser_stop_hot.png" type="BINDATA " />
173 <include name="IDR_STOP_P" file="ash/browser_stop_pressed.png" type="BIN DATA" />
174 </if>
175 <if expr="not pp_ifdef('use_ash')">
176 <include name="IDR_STOP" file="stop.png" type="BINDATA" />
177 <include name="IDR_STOP_D" file="stop_d.png" type="BINDATA" />
178 <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" />
179 <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
180 </if>
121 <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="B INDATA" /> 181 <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="B INDATA" />
122 <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BINDA TA" /> 182 <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BINDA TA" />
123 <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="BIN DATA" /> 183 <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="BIN DATA" />
124 <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDATA " /> 184 <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDATA " />
125 <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BINDA TA" /> 185 <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BINDA TA" />
126 <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" /> 186 <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" />
127 <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" /> 187 <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" />
128 <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA " /> 188 <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA " />
129 <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" /> 189 <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" />
130 <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" /> 190 <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" />
131 <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" /> 191 <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" />
132 <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" typ e="BINDATA" /> 192 <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" typ e="BINDATA" />
133 <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type="B INDATA" /> 193 <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type="B INDATA" />
134 <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type= "BINDATA" /> 194 <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type= "BINDATA" />
135 <if expr="pp_ifdef('use_aura')"> 195 <if expr="pp_ifdef('use_ash')">
136 <include name="IDR_THEME_FRAME" file="theme_frame_default_aura.png" type ="BINDATA" /> 196 <include name="IDR_THEME_FRAME" file="theme_frame_default_aura.png" type ="BINDATA" />
137 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive_aura.png" type="BINDATA" /> 197 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive_aura.png" type="BINDATA" />
138 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito_aura.png" type="BINDATA" /> 198 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito_aura.png" type="BINDATA" />
139 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_def ault_incognito_aura.png" type="BINDATA" /> 199 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_def ault_incognito_aura.png" type="BINDATA" />
140 </if> 200 </if>
141 <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_aura')"> 201 <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_ash')">
142 <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BI NDATA" /> 202 <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BI NDATA" />
143 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default2.png" type="BINDATA" /> 203 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default2.png" type="BINDATA" />
144 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default2_inc ognito.png" type="BINDATA" /> 204 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default2_inc ognito.png" type="BINDATA" />
145 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_def ault2_incognito.png" type="BINDATA" /> 205 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_def ault2_incognito.png" type="BINDATA" />
146 </if> 206 </if>
147 <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_aura')"> 207 <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_ash')">
148 <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BIN DATA" /> 208 <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BIN DATA" />
149 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive.png" type="BINDATA" /> 209 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive.png" type="BINDATA" />
150 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito.png" type="BINDATA" /> 210 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito.png" type="BINDATA" />
151 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_def ault_incognito_inactive.png" type="BINDATA" /> 211 <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_def ault_incognito_inactive.png" type="BINDATA" />
152 </if> 212 </if>
153 <if expr="pp_ifdef('use_aura')"> 213 <if expr="pp_ifdef('use_ash')">
154 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background_aura .png" type="BINDATA" /> 214 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background_aura .png" type="BINDATA" />
155 </if> 215 </if>
156 <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_aura')"> 216 <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_ash')">
157 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png " type="BINDATA" /> 217 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png " type="BINDATA" />
158 </if> 218 </if>
159 <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_aura')"> 219 <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_ash')">
160 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" /> 220 <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
161 </if> 221 </if>
162 <if expr="pp_ifdef('chromeos') or is_macosx"> 222 <if expr="pp_ifdef('chromeos') or is_macosx">
163 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type ="BINDATA" /> 223 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type ="BINDATA" />
164 </if> 224 </if>
165 <if expr="not pp_ifdef('chromeos') and not is_macosx"> 225 <if expr="not pp_ifdef('chromeos') and not is_macosx">
166 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" /> 226 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" />
167 </if> 227 </if>
168 <if expr="is_macosx"> 228 <if expr="is_macosx">
169 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_i nactive2.png" type="BINDATA" /> 229 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_i nactive2.png" type="BINDATA" />
170 </if> 230 </if>
171 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" /> 231 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" />
172 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" /> 232 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
173 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" /> 233 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
174 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" /> 234 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
175 </includes> 235 </includes>
176 </release> 236 </release>
177 </grit> 237 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698