diff options
| -rw-r--r-- | app/resources/app_resources.grd | 205 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 699 | ||||
| -rw-r--r-- | chrome/browser/browser_resources.grd | 75 | ||||
| -rw-r--r-- | chrome/browser/resources/bookmark_manager_resources.grd | 26 | ||||
| -rw-r--r-- | chrome/browser/resources/net_internals_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/resources/shared_resources.grd | 35 | ||||
| -rw-r--r-- | chrome/common/common_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/renderer/renderer_resources.grd | 10 | ||||
| -rw-r--r-- | chrome_frame/resources/chrome_frame_resources.grd | 9 | ||||
| -rw-r--r-- | net/base/net_resources.grd | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 69 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_resources.grd | 3 |
12 files changed, 582 insertions, 563 deletions
diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd index 3887a67..d9eca92 100644 --- a/app/resources/app_resources.grd +++ b/app/resources/app_resources.grd @@ -4,137 +4,152 @@ <output filename="grit/app_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="app_resources.pak" type="data_package" /> <output filename="app_resources.rc" type="rc_all" /> + <output filename="app_resources.pak" type="data_package" /> </outputs> <release seq="1"> <includes> - <include name="IDR_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" /> - <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" /> - <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_BADGE_CENTER" file="browser_action_badge_center.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_BADGE_LEFT" file="browser_action_badge_left.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_BADGE_RIGHT" file="browser_action_badge_right.png" type="BINDATA" /> + + <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> + <if expr="pp_ifdef('toolkit_views')"> + <!-- Window controls for Windows and Chrome OS, in the style of Vista --> <include name="IDR_CLOSE" file="close.png" type="BINDATA" /> <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" /> <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" /> <include name="IDR_CLOSE_SA" file="close_sa.png" type="BINDATA" /> <include name="IDR_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" /> <include name="IDR_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" /> + <include name="IDR_RESTORE" file="restore.png" type="BINDATA" /> + <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" /> + <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" /> + <include name="IDR_MINIMIZE" file="minimize.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)"> + <!-- Window controls for Linux/BSD, in the style of Metacity --> <include name="IDR_CLOSE" file="linux_close.png" type="BINDATA" /> <include name="IDR_CLOSE_H" file="linux_close_h.png" type="BINDATA" /> <include name="IDR_CLOSE_P" file="linux_close_p.png" type="BINDATA" /> <include name="IDR_CLOSE_SA" file="linux_close.png" type="BINDATA" /> <include name="IDR_CLOSE_SA_H" file="linux_close_h.png" type="BINDATA" /> <include name="IDR_CLOSE_SA_P" file="linux_close_p.png" type="BINDATA" /> + <include name="IDR_RESTORE" file="linux_restore.png" type="BINDATA" /> + <include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" /> + <include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE" file="linux_maximize.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_H" file="linux_maximize_h.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_P" file="linux_maximize_p.png" type="BINDATA" /> + <include name="IDR_MINIMIZE" file="linux_minimize.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_H" file="linux_minimize_h.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_P" file="linux_minimize_p.png" type="BINDATA" /> </if> + + <!-- Frame Images --> + <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" /> + <include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" /> + <include name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" type="BINDATA" /> + + <!-- Frame Edge Images --> + <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" /> + <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" /> + <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" /> + + <!-- Frame Client Edge Images --> + <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" /> + <include name="IDR_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" /> + <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" /> <include name="IDR_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" type="BINDATA" /> <include name="IDR_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" type="BINDATA" /> <include name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" type="BINDATA" /> <include name="IDR_CONTENT_LEFT_SIDE" file="content_left_side.png" type="BINDATA" /> <include name="IDR_CONTENT_RIGHT_SIDE" file="content_right_side.png" type="BINDATA" /> - <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> + + <!-- Gripper resizer --> + <include name="IDR_RESIZE_GRIPPER" file="resize_gripper.png" type="BINDATA" /> + + <!-- Throbber --> + <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" /> + + <!-- Input Validation --> + <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" /> + <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" /> + + <!-- Folder Icons --> <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" /> - <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> + <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" /> - <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" /> - <include name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" type="BINDATA" /> - <include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_H" file="infobarbutton_bl_h.png" type="BINDATA" /> + + <!-- Toolbar Button highlights --> + <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" /> + + <!-- Menus --> + <include name="IDR_MENU_DROPARROW" file="menu_droparrow.png" type="BINDATA" /> + <include name="IDR_MENU_CHECK" file="menu_check.png" type="BINDATA" /> + <include name="IDR_MENU_ARROW" file="menu_arrow.png" type="BINDATA" /> + + <!-- Extension browser action badge --> + <include name="IDR_BROWSER_ACTION_BADGE_LEFT" file="browser_action_badge_left.png" type="BINDATA" /> + <include name="IDR_BROWSER_ACTION_BADGE_RIGHT" file="browser_action_badge_right.png" type="BINDATA" /> + <include name="IDR_BROWSER_ACTION_BADGE_CENTER" file="browser_action_badge_center.png" type="BINDATA" /> + + <!-- Infobar Buttons normal, highlighted and pushed images --> + <include name="IDR_INFOBARBUTTON_TOP_LEFT_N" file="infobarbutton_tl_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_N" file="infobarbutton_t_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_RIGHT_N" file="infobarbutton_tr_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_LEFT_N" file="infobarbutton_l_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_CENTER_N" file="infobarbutton_c_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_RIGHT_N" file="infobarbutton_r_n.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_N" file="infobarbutton_bl_n.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_P" file="infobarbutton_bl_p.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_BOTTOM_H" file="infobarbutton_b_h.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_BOTTOM_N" file="infobarbutton_b_n.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_BOTTOM_P" file="infobarbutton_b_p.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_H" file="infobarbutton_br_h.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_N" file="infobarbutton_br_n.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_P" file="infobarbutton_br_p.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_CENTER_H" file="infobarbutton_c_h.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_CENTER_N" file="infobarbutton_c_n.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_CENTER_P" file="infobarbutton_c_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_LEFT_H" file="infobarbutton_tl_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_H" file="infobarbutton_t_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_RIGHT_H" file="infobarbutton_tr_h.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_LEFT_H" file="infobarbutton_l_h.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_LEFT_N" file="infobarbutton_l_n.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_LEFT_P" file="infobarbutton_l_p.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_MENU_DROPARROW" file="infobarbutton_menu_droparrow.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_CENTER_H" file="infobarbutton_c_h.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_RIGHT_H" file="infobarbutton_r_h.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_RIGHT_N" file="infobarbutton_r_n.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_RIGHT_P" file="infobarbutton_r_p.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_TOP_H" file="infobarbutton_t_h.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_TOP_LEFT_H" file="infobarbutton_tl_h.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_TOP_LEFT_N" file="infobarbutton_tl_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_H" file="infobarbutton_bl_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_H" file="infobarbutton_b_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_H" file="infobarbutton_br_h.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_TOP_LEFT_P" file="infobarbutton_tl_p.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_TOP_N" file="infobarbutton_t_n.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_TOP_P" file="infobarbutton_t_p.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_TOP_RIGHT_H" file="infobarbutton_tr_h.png" type="BINDATA" /> - <include name="IDR_INFOBARBUTTON_TOP_RIGHT_N" file="infobarbutton_tr_n.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_TOP_RIGHT_P" file="infobarbutton_tr_p.png" type="BINDATA" /> - <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" /> - <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" /> - <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" /> - <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)"> - <include name="IDR_MAXIMIZE" file="linux_maximize.png" type="BINDATA" /> - <include name="IDR_MAXIMIZE_H" file="linux_maximize_h.png" type="BINDATA" /> - <include name="IDR_MAXIMIZE_P" file="linux_maximize_p.png" type="BINDATA" /> - </if> - <include name="IDR_MENU_ARROW" file="menu_arrow.png" type="BINDATA" /> - <include name="IDR_MENU_CHECK" file="menu_check.png" type="BINDATA" /> - <include name="IDR_MENU_DROPARROW" file="menu_droparrow.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_MINIMIZE" file="minimize.png" type="BINDATA" /> - <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" /> - <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)"> - <include name="IDR_MINIMIZE" file="linux_minimize.png" type="BINDATA" /> - <include name="IDR_MINIMIZE_H" file="linux_minimize_h.png" type="BINDATA" /> - <include name="IDR_MINIMIZE_P" file="linux_minimize_p.png" type="BINDATA" /> - </if> - <include name="IDR_RESIZE_GRIPPER" file="resize_gripper.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_RESTORE" file="restore.png" type="BINDATA" /> - <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" /> - <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)"> - <include name="IDR_RESTORE" file="linux_restore.png" type="BINDATA" /> - <include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" /> - <include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" /> - </if> - <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" /> - <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" /> - <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" /> - <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" /> - <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" /> - <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" /> - <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" /> - <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" /> - <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" /> - <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_LEFT_P" file="infobarbutton_l_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_CENTER_P" file="infobarbutton_c_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_RIGHT_P" file="infobarbutton_r_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_P" file="infobarbutton_bl_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_P" file="infobarbutton_b_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_P" file="infobarbutton_br_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_MENU_DROPARROW" file="infobarbutton_menu_droparrow.png" type="BINDATA" /> </includes> </release> </grit> diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 2df0d82..b4ca9a1 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -4,81 +4,19 @@ <output filename="grit/theme_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="grit/theme_resources_map.cc" type="resource_map_source" /> - <output filename="grit/theme_resources_map.h" type="resource_map_header" /> - <output filename="theme_resources.pak" type="data_package" /> <output filename="theme_resources.rc" type="rc_all" /> + <output filename="theme_resources.pak" type="data_package" /> + <output filename="grit/theme_resources_map.h" type="resource_map_header" /> + <output filename="grit/theme_resources_map.cc" type="resource_map_source" /> </outputs> <release seq="1"> <includes> - <if expr="pp_ifdef('_google_chrome')"> - <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_background.png" type="BINDATA" /> - <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_background_color.png" type="BINDATA" /> - <include name="IDR_ABOUT_BACKGROUND_RTL" file="google_chrome/about_background_rtl.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('_google_chrome')"> - <include name="IDR_ABOUT_BACKGROUND" file="chromium/about_background.png" type="BINDATA" /> - <include name="IDR_ABOUT_BACKGROUND_COLOR" file="chromium/about_background_color.png" type="BINDATA" /> - <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background_rtl.png" type="BINDATA" /> - </if> - <include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" /> - <include name="IDR_ARROW_RIGHT" file="arrow_right.png" type="BINDATA" /> <include name="IDR_BACK" file="back.png" type="BINDATA" /> <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" /> <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" /> - <include name="IDR_BACK_MASK" file="back_mask.png" type="BINDATA" /> <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" /> - <include name="IDR_BALLOON_BORDER" file="balloon_frame.png" type="BINDATA" /> - <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" /> - <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" type="BINDATA" /> - <include name="IDR_BALLOON_OPTIONS_ARROW" file="balloon_options_arrow.png" type="BINDATA" /> - <include name="IDR_BALLOON_OPTIONS_ARROW_HOVER" file="balloon_options_arrow_hover.png" type="BINDATA" /> - <include name="IDR_BALLOON_SHELF" file="balloon_shelf.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH" file="balloon_wrench.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_HOVER" file="balloon_wrench_hover.png" type="BINDATA" /> - <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDATA" /> - <include name="IDR_BLOCKED_IMAGES" file="blocked_images.png" type="BINDATA" /> - <include name="IDR_BLOCKED_JAVASCRIPT" file="blocked_javascript.png" type="BINDATA" /> - <include name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" type="BINDATA" /> - <include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA" /> - <include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" type="BINDATA" /> - <include name="IDR_BOOKMARK_BAR_CHEVRONS" file="chevron.png" type="BINDATA" /> - <if expr="os != 'darwin'"> - <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" type="BINDATA" /> - </if> - <if expr="os == 'darwin'"> - <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.png" type="BINDATA" /> - </if> <include name="IDR_BOOKMARK_BAR_RECENTLY_BOOKMARKED_ICON" file="star_small.png" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_RECENT_ICON" file="bookmark_manager_recent.png" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_SEARCH_ICON" file="bookmark_manager_search.png" type="BINDATA" /> - <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_B_ARROW" file="bubble_b_arrow.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L" file="bubble_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L_ARROW" file="bubble_l_arrow.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R" file="bubble_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R_ARROW" file="bubble_r_arrow.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T_ARROW" file="bubble_t_arrow.png" type="BINDATA" /> - <include name="IDR_BUTTON_MASK" file="button_mask.png" type="BINDATA" /> - <include name="IDR_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" /> - <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="BINDATA" /> - <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_center_v.png" type="BINDATA" /> - <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bottom_left_corner_v.png" type="BINDATA" /> - <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bottom_right_corner_v.png" type="BINDATA" /> - <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v.png" type="BINDATA" /> - <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_v.png" type="BINDATA" /> - <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_v.png" type="BINDATA" /> - <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_left_corner_v.png" type="BINDATA" /> - <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_right_corner_v.png" type="BINDATA" /> + <include name="IDR_BOOKMARK_BAR_CHEVRONS" file="chevron.png" type="BINDATA" /> <include name="IDR_CONTENT_STAR_D" file="content_star_d.png" type="BINDATA" /> <include name="IDR_CONTENT_STAR_OFF" file="content_star_off.png" type="BINDATA" /> <include name="IDR_CONTENT_STAR_ON" file="content_star_on.png" type="BINDATA" /> @@ -87,15 +25,63 @@ <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" type="BINDATA" /> <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" type="BINDATA" /> <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" type="BINDATA" /> - <include name="IDR_COOKIE_ICON" file="cookie.png" type="BINDATA" /> - <include name="IDR_COOKIE_STORAGE_ICON" file="cookie_storage.png" type="BINDATA" /> - <include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="BINDATA" /> - <include name="IDR_DOCK_HIGH" file="dock_tab_high.png" type="BINDATA" /> - <include name="IDR_DOCK_MAX" file="dock_tab_max.png" type="BINDATA" /> - <include name="IDR_DOCK_WIDE" file="dock_tab_wide.png" type="BINDATA" /> - <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="BINDATA" /> - <include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="BINDATA" /> - <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begin.png" type="BINDATA" /> + <include name="IDR_DROP" file="drop.png" type="BINDATA" /> + <include name="IDR_DROP_H" file="drop_h.png" type="BINDATA" /> + <include name="IDR_DROP_P" file="drop_p.png" type="BINDATA" /> + <include name="IDR_FORWARD" file="forward.png" type="BINDATA" /> + <include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" /> + <include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" /> + <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" /> + <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" /> + <include name="IDR_LOCATIONBG_C" file="locationbg_c.png" type="BINDATA" /> + <include name="IDR_LOCATIONBG_L" file="locationbg_l.png" type="BINDATA" /> + <include name="IDR_LOCATIONBG_R" file="locationbg_r.png" type="BINDATA" /> + <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="location_bar_keyword_search_c.png" type="BINDATA" /> + <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="location_bar_keyword_search_l.png" type="BINDATA" /> + <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="location_bar_keyword_search_r.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="omnibox_ev_bubble_background_c.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="omnibox_ev_bubble_background_l.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="omnibox_ev_bubble_background_r.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HISTORY" file="omnibox_history.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HISTORY_DARK" file="omnibox_history_dark.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HISTORY_SELECTED" file="omnibox_history_selected.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HTTP" file="omnibox_http.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HTTP_DARK" file="omnibox_http_dark.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HTTP_SELECTED" file="omnibox_http_selected.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HTTPS_INVALID" file="omnibox_https_invalid.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HTTPS_VALID" file="omnibox_https_valid.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_HTTPS_WARNING" file="omnibox_https_warning.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_MORE" file="omnibox_more.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_MORE_DARK" file="omnibox_more_dark.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_MORE_SELECTED" file="omnibox_more_selected.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_SEARCH" file="omnibox_search.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_SEARCH_DARK" file="omnibox_search_dark.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_SEARCH_SELECTED" file="omnibox_search_selected.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_STAR" file="omnibox_star.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_STAR_LIT" file="omnibox_star_lit.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_STAR_DARK" file="omnibox_star_dark.png" type="BINDATA" /> + <include name="IDR_OMNIBOX_STAR_SELECTED" file="omnibox_star_selected.png" type="BINDATA" /> + <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" /> + <include name="IDR_RELOAD" file="reload.png" type="BINDATA" /> + <include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" /> + <include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" /> + <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="BINDATA" /> + <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BINDATA" /> + <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="BINDATA" /> + <include name="IDR_TAB_ACTIVE_NANO_CENTER" file="tab_active_nano_center.png" type="BINDATA" /> + <include name="IDR_TAB_ACTIVE_NANO_LEFT" file="tab_active_nano_left.png" type="BINDATA" /> + <include name="IDR_TAB_ACTIVE_NANO_RIGHT" file="tab_active_nano_right.png" type="BINDATA" /> + <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" /> + <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" /> + <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" /> + <include name="IDR_TAB_CLOSE_DOT_MASK" file="tab_close_dot_mask.png" type="BINDATA" /> + <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA" /> + <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" type="BINDATA" /> + <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type="BINDATA" /> + <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type="BINDATA" /> + <include name="IDR_TAB_INACTIVE_NANO_CENTER" file="tab_inactive_nano_center.png" type="BINDATA" /> + <include name="IDR_TAB_INACTIVE_NANO_LEFT" file="tab_inactive_nano_left.png" type="BINDATA" /> + <include name="IDR_TAB_INACTIVE_NANO_RIGHT" file="tab_inactive_nano_right.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM" file="download_button_center_bottom.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_H" file="download_button_center_bottom_h.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_P" file="download_button_center_bottom_p.png" type="BINDATA" /> @@ -125,113 +111,66 @@ <include name="IDR_DOWNLOAD_BUTTON_MENU_TOP_P" file="download_button_menu_top_p.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM" file="download_button_right_bottom.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_H" file="download_button_right_bottom_h.png" type="BINDATA" /> - <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_NO_DD" file="download_button_right_bottom_no_dd.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_P" file="download_button_right_bottom_p.png" type="BINDATA" /> + <include name="IDR_DOWNLOAD_BUTTON_RIGHT_BOTTOM_NO_DD" file="download_button_right_bottom_no_dd.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE" file="download_button_right_middle.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_H" file="download_button_right_middle_h.png" type="BINDATA" /> - <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_NO_DD" file="download_button_right_middle_no_dd.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_P" file="download_button_right_middle_p.png" type="BINDATA" /> + <include name="IDR_DOWNLOAD_BUTTON_RIGHT_MIDDLE_NO_DD" file="download_button_right_middle_no_dd.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP" file="download_button_right_top.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_H" file="download_button_right_top_h.png" type="BINDATA" /> - <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_NO_DD" file="download_button_right_top_no_dd.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_P" file="download_button_right_top_p.png" type="BINDATA" /> - <include name="IDR_DOWNLOAD_ICON" file="download_icon.png" type="BINDATA" /> + <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_NO_DD" file="download_button_right_top_no_dd.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_16" file="download_progress_background16.png" type="BINDATA" /> - <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="download_progress_background32.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_16" file="download_progress_foreground16.png" type="BINDATA" /> + <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="download_progress_background32.png" type="BINDATA" /> <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="download_progress_foreground32.png" type="BINDATA" /> - <include name="IDR_DROP" file="drop.png" type="BINDATA" /> - <include name="IDR_DROP_H" file="drop_h.png" type="BINDATA" /> - <include name="IDR_DROP_P" file="drop_p.png" type="BINDATA" /> + <include name="IDR_DOWNLOAD_ICON" file="download_icon.png" type="BINDATA" /> <include name="IDR_EXPAND_ARROW_DOWN_ICON" file="expand_arrow_down.png" type="BINDATA" /> <include name="IDR_EXPAND_ARROW_RIGHT_ICON" file="expand_arrow_right.png" type="BINDATA" /> - <include name="IDR_EXTENSIONS_SECTION" file="extensions_section.png" type="BINDATA" /> - <include name="IDR_FINDINPAGE_NEXT" file="find_next.png" type="BINDATA" /> - <include name="IDR_FINDINPAGE_NEXT_H" file="find_next_h.png" type="BINDATA" /> - <include name="IDR_FINDINPAGE_NEXT_P" file="find_next_d.png" type="BINDATA" /> - <include name="IDR_FINDINPAGE_PREV" file="find_prev.png" type="BINDATA" /> - <include name="IDR_FINDINPAGE_PREV_H" file="find_prev_h.png" type="BINDATA" /> - <include name="IDR_FINDINPAGE_PREV_P" file="find_prev_d.png" type="BINDATA" /> <include name="IDR_FIND_BOX_BACKGROUND" file="find_box_bg.png" type="BINDATA" /> <include name="IDR_FIND_BOX_BACKGROUND_LEFT" file="find_box_bg_left.png" type="BINDATA" /> <include name="IDR_FIND_BOX_BACKGROUND_LEFT_RTL" file="find_box_bg_left_rtl.png" type="BINDATA" /> - <include name="IDR_FIND_DIALOG_LEFT" file="find_dialog_left.png" type="BINDATA" /> - <include name="IDR_FIND_DIALOG_MIDDLE" file="find_dialog_middle.png" type="BINDATA" /> - <include name="IDR_FIND_DIALOG_RIGHT" file="find_dialog_right.png" type="BINDATA" /> + <include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" /> + <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDATA" /> + <include name="IDR_BLOCKED_IMAGES" file="blocked_images.png" type="BINDATA" /> + <include name="IDR_BLOCKED_JAVASCRIPT" file="blocked_javascript.png" type="BINDATA" /> + <include name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" type="BINDATA" /> + <include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA" /> + <include name="IDR_WARNING" file="alert_small.png" type="BINDATA" /> + <include name="IDR_STOP" file="stop.png" type="BINDATA" /> + <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" /> + <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" /> <!-- The following (IDR_FIND_DLG_[LEFT|RIGHT|MIDDLE]_[BB]_BACKGROUND) are deprecated but are kept around for the Linux port --> <include name="IDR_FIND_DLG_LEFT_BACKGROUND" file="find_dlg_left_bg.png" type="BINDATA" /> - <include name="IDR_FIND_DLG_LEFT_BB_BACKGROUND" file="find_dlg_left_bb_bg.png" type="BINDATA" /> <include name="IDR_FIND_DLG_RIGHT_BACKGROUND" file="find_dlg_right_bg.png" type="BINDATA" /> - <include name="IDR_FIND_DLG_RIGHT_BB_BACKGROUND" file="find_dlg_right_bb_bg.png" type="BINDATA" /> <include name="IDR_FIND_DLG_MIDDLE_BACKGROUND" file="find_dlg_middle_bg.png" type="BINDATA" /> + <include name="IDR_FIND_DLG_LEFT_BB_BACKGROUND" file="find_dlg_left_bb_bg.png" type="BINDATA" /> + <include name="IDR_FIND_DLG_RIGHT_BB_BACKGROUND" file="find_dlg_right_bb_bg.png" type="BINDATA" /> <include name="IDR_FIND_DLG_MIDDLE_BB_BACKGROUND" file="find_dlg_middle_bb_bg.png" type="BINDATA" /> <!-- End deprecated files --> - <include name="IDR_FORWARD" file="forward.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" /> - <include name="IDR_FORWARD_MASK" file="forward_mask.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" /> - <include name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" type="BINDATA" /> - <include name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.png" type="BINDATA" /> - <include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation_allowed_locationbar_icon.png" type="BINDATA" /> - <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_denied_locationbar_icon.png" type="BINDATA" /> - <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_icon.png" type="BINDATA" /> - <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" /> - <include name="IDR_HISTORY_SECTION" file="history_section.png" type="BINDATA" /> - <include name="IDR_HOME" file="home.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" /> - <include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_QUESTION_MARK" file="infobar_questionmark.png" type="BINDATA" /> - <include name="IDR_INFOBAR_RESTORE_SESSION" file="infobar_restore.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SAVE_PASSWORD" file="infobar_savepassword.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SSL_WARNING" file="infobar_insecure.png" type="BINDATA" /> - <include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" /> - <if expr="pp_ifdef('_google_chrome')"> - <include name="IDR_INFOBAR_TRANSLATE" file="google_chrome/infobar_translate.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('_google_chrome')"> - <include name="IDR_INFOBAR_TRANSLATE" file="chromium/infobar_translate.png" type="BINDATA" /> - </if> - <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_C" file="locationbg_c.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="locationbg_l.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="locationbg_readonly_center.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_POPUPMODE_EDGE" file="locationbg_readonly_edge.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="locationbg_r.png" type="BINDATA" /> - <if expr="os != 'darwin'"> - <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab.png" type="BINDATA" /> - </if> - <if expr="os == 'darwin'"> - <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab_mac.png" type="BINDATA" /> - </if> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="location_bar_keyword_search_c.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="location_bar_keyword_search_l.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="location_bar_keyword_search_r.png" type="BINDATA" /> - <include name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" type="BINDATA" /> - <include name="IDR_MENU_CHROME" file="menu_chrome.png" type="BINDATA" /> - <include name="IDR_MENU_CHROME_RTL" file="menu_chrome_rtl.png" type="BINDATA" /> - <include name="IDR_MENU_MARKER" file="menu_marker.png" type="BINDATA" /> - <include name="IDR_MENU_PAGE" file="menu_page.png" type="BINDATA" /> - <include name="IDR_MENU_PAGE_RTL" file="menu_page_rtl.png" type="BINDATA" /> - <include name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" type="BINDATA" /> + <include name="IDR_FIND_DIALOG_LEFT" file="find_dialog_left.png" type="BINDATA" /> + <include name="IDR_FIND_DIALOG_MIDDLE" file="find_dialog_middle.png" type="BINDATA" /> + <include name="IDR_FIND_DIALOG_RIGHT" file="find_dialog_right.png" type="BINDATA" /> + <include name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" type="BINDATA" /> + <include name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" type="BINDATA" /> <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" /> <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" /> <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" /> - <include name="IDR_NEWTAB_CHECKBOX_BLACK" file="checkbox_black.png" type="BINDATA" /> - <include name="IDR_NEWTAB_CHECKBOX_WHITE" file="checkbox_white.png" type="BINDATA" /> - <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON" file="ntp_welcome_favicon.png" type="BINDATA" /> - <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="ntp_welcome_thumb.png" type="BINDATA" /> - <include name="IDR_NEWTAB_CLOSE" file="ntp_close.png" type="BINDATA" /> + <include name="IDR_NEWTAB_REMOVE_ICON" file="ntp_x_icon_small.png" type="BINDATA" /> + <include name="IDR_NEWTAB_REMOVE_THUMBNAIL" file="ntp_x_icon.png" type="BINDATA" /> + <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_HOVER" file="ntp_x_icon_hover.png" type="BINDATA" /> + <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_ACTIVE" file="ntp_x_icon_active.png" type="BINDATA" /> <include name="IDR_NEWTAB_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" /> + <include name="IDR_NEWTAB_PIN_ON" file="ntp_pin_on.png" type="BINDATA" /> + <include name="IDR_NEWTAB_PIN_ON_H" file="ntp_pin_on_h.png" type="BINDATA" /> + <include name="IDR_NEWTAB_PIN_ON_P" file="ntp_pin_on_p.png" type="BINDATA" /> + <include name="IDR_NEWTAB_PIN_OFF" file="ntp_pin_off.png" type="BINDATA" /> + <include name="IDR_NEWTAB_PIN_OFF_H" file="ntp_pin_off_h.png" type="BINDATA" /> + <include name="IDR_NEWTAB_PIN_OFF_P" file="ntp_pin_off_p.png" type="BINDATA" /> + <include name="IDR_NEWTAB_CLOSE" file="ntp_close.png" type="BINDATA" /> <include name="IDR_NEWTAB_CLOSE_H" file="ntp_close_h.png" type="BINDATA" /> <include name="IDR_NEWTAB_CLOSE_P" file="ntp_close_p.png" type="BINDATA" /> - <include name="IDR_NEWTAB_EXTENSIONS_PROMO" file="ntp_extensions_promo.png" type="BINDATA" /> <include name="IDR_NEWTAB_LIST_OFF" file="ntp_list_off.png" type="BINDATA" /> <include name="IDR_NEWTAB_LIST_OFF_H" file="ntp_list_off_h.png" type="BINDATA" /> <include name="IDR_NEWTAB_LIST_OFF_P" file="ntp_list_off_p.png" type="BINDATA" /> @@ -239,105 +178,226 @@ <include name="IDR_NEWTAB_LIST_ON_H" file="ntp_list_on_h.png" type="BINDATA" /> <include name="IDR_NEWTAB_LIST_ON_P" file="ntp_list_on_p.png" type="BINDATA" /> <include name="IDR_NEWTAB_MENU_MASK" file="ntp_menu_mask.png" type="BINDATA" /> - <include name="IDR_NEWTAB_OPTION" file="ntp_option.png" type="BINDATA" /> - <include name="IDR_NEWTAB_OPTION_H" file="ntp_option_h.png" type="BINDATA" /> - <include name="IDR_NEWTAB_OPTION_P" file="ntp_option_p.png" type="BINDATA" /> - <include name="IDR_NEWTAB_PIN_OFF" file="ntp_pin_off.png" type="BINDATA" /> - <include name="IDR_NEWTAB_PIN_OFF_H" file="ntp_pin_off_h.png" type="BINDATA" /> - <include name="IDR_NEWTAB_PIN_OFF_P" file="ntp_pin_off_p.png" type="BINDATA" /> - <include name="IDR_NEWTAB_PIN_ON" file="ntp_pin_on.png" type="BINDATA" /> - <include name="IDR_NEWTAB_PIN_ON_H" file="ntp_pin_on_h.png" type="BINDATA" /> - <include name="IDR_NEWTAB_PIN_ON_P" file="ntp_pin_on_p.png" type="BINDATA" /> - <include name="IDR_NEWTAB_REMOVE_ICON" file="ntp_x_icon_small.png" type="BINDATA" /> - <include name="IDR_NEWTAB_REMOVE_THUMBNAIL" file="ntp_x_icon.png" type="BINDATA" /> - <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_ACTIVE" file="ntp_x_icon_active.png" type="BINDATA" /> - <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_HOVER" file="ntp_x_icon_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_THEMES_GALLERY_FAVICON" file="ntp_themes_gallery_favicon.png" type="BINDATA" /> - <include name="IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL" file="ntp_themes_gallery_thumb.png" type="BINDATA" /> <include name="IDR_NEWTAB_THUMB_OFF" file="ntp_thumb_off.png" type="BINDATA" /> <include name="IDR_NEWTAB_THUMB_OFF_H" file="ntp_thumb_off_h.png" type="BINDATA" /> <include name="IDR_NEWTAB_THUMB_OFF_P" file="ntp_thumb_off_p.png" type="BINDATA" /> <include name="IDR_NEWTAB_THUMB_ON" file="ntp_thumb_on.png" type="BINDATA" /> <include name="IDR_NEWTAB_THUMB_ON_H" file="ntp_thumb_on_h.png" type="BINDATA" /> <include name="IDR_NEWTAB_THUMB_ON_P" file="ntp_thumb_on_p.png" type="BINDATA" /> - <if expr="pp_ifdef('_google_chrome')"> - <include name="IDR_PRODUCT_ICON_32" file="google_chrome/google_chrome_icon_32.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" type="BINDATA" /> + <include name="IDR_NEWTAB_OPTION" file="ntp_option.png" type="BINDATA" /> + <include name="IDR_NEWTAB_OPTION_H" file="ntp_option_h.png" type="BINDATA" /> + <include name="IDR_NEWTAB_OPTION_P" file="ntp_option_p.png" type="BINDATA" /> + <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="ntp_welcome_thumb.png" type="BINDATA" /> + <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON" file="ntp_welcome_favicon.png" type="BINDATA" /> + <include name="IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL" file="ntp_themes_gallery_thumb.png" type="BINDATA" /> + <include name="IDR_NEWTAB_THEMES_GALLERY_FAVICON" file="ntp_themes_gallery_favicon.png" type="BINDATA" /> + <include name="IDR_NEWTAB_CHECKBOX_BLACK" file="checkbox_black.png" type="BINDATA" /> + <include name="IDR_NEWTAB_CHECKBOX_WHITE" file="checkbox_white.png" type="BINDATA" /> + <include name="IDR_NEWTAB_EXTENSIONS_PROMO" file="ntp_extensions_promo.png" type="BINDATA" /> + <include name="IDR_ARROW_RIGHT" file="arrow_right.png" type="BINDATA" /> + <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" /> + <include name="IDR_OTR_ICON" file="otr_icon.png" type="BINDATA" /> + <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_center_v.png" type="BINDATA" /> + <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bottom_left_corner_v.png" type="BINDATA" /> + <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bottom_right_corner_v.png" type="BINDATA" /> + <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v.png" type="BINDATA" /> + <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_v.png" type="BINDATA" /> + <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_v.png" type="BINDATA" /> + <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_left_corner_v.png" type="BINDATA" /> + <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_right_corner_v.png" type="BINDATA" /> + <if expr="os != 'darwin'"> + <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab.png" type="BINDATA" /> </if> - <if expr="not pp_ifdef('_google_chrome')"> - <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white.png" type="BINDATA" /> + <if expr="os == 'darwin'"> + <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab_mac.png" type="BINDATA" /> </if> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="omnibox_ev_bubble_background_c.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="omnibox_ev_bubble_background_l.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="omnibox_ev_bubble_background_r.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HISTORY" file="omnibox_history.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HISTORY_DARK" file="omnibox_history_dark.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HISTORY_SELECTED" file="omnibox_history_selected.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HTTP" file="omnibox_http.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HTTPS_INVALID" file="omnibox_https_invalid.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HTTPS_VALID" file="omnibox_https_valid.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HTTPS_WARNING" file="omnibox_https_warning.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HTTP_DARK" file="omnibox_http_dark.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_HTTP_SELECTED" file="omnibox_http_selected.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_MORE" file="omnibox_more.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_MORE_DARK" file="omnibox_more_dark.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_MORE_SELECTED" file="omnibox_more_selected.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_SEARCH" file="omnibox_search.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_SEARCH_DARK" file="omnibox_search_dark.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_SEARCH_SELECTED" file="omnibox_search_selected.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_STAR" file="omnibox_star.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_STAR_DARK" file="omnibox_star_dark.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_STAR_LIT" file="omnibox_star_lit.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_STAR_SELECTED" file="omnibox_star_selected.png" type="BINDATA" /> - <include name="IDR_OTR_ICON" file="otr_icon.png" type="BINDATA" /> + <include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" /> + <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" /> + <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" /> + <include name="IDR_FINDINPAGE_PREV" file="find_prev.png" type="BINDATA" /> + <include name="IDR_FINDINPAGE_PREV_H" file="find_prev_h.png" type="BINDATA" /> + <include name="IDR_FINDINPAGE_PREV_P" file="find_prev_d.png" type="BINDATA" /> + <include name="IDR_FINDINPAGE_NEXT" file="find_next.png" type="BINDATA" /> + <include name="IDR_FINDINPAGE_NEXT_H" file="find_next_h.png" type="BINDATA" /> + <include name="IDR_FINDINPAGE_NEXT_P" file="find_next_d.png" type="BINDATA" /> + <include name="IDR_COOKIE_ICON" file="cookie.png" type="BINDATA" /> + <include name="IDR_COOKIE_STORAGE_ICON" file="cookie_storage.png" type="BINDATA" /> + <include name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" type="BINDATA" /> + <include name="IDR_INFOBAR_RESTORE_SESSION" file="infobar_restore.png" type="BINDATA" /> + <include name="IDR_INFOBAR_SAVE_PASSWORD" file="infobar_savepassword.png" type="BINDATA" /> + <include name="IDR_INFOBAR_SSL_WARNING" file="infobar_insecure.png" type="BINDATA" /> + <include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type="BINDATA" /> + <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type="BINDATA" /> + <include name="IDR_INFOBAR_QUESTION_MARK" file="infobar_questionmark.png" type="BINDATA" /> + <include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" /> + <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" type="BINDATA" /> + <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" type="BINDATA" /> + <include name="IDR_MENU_MARKER" file="menu_marker.png" type="BINDATA" /> + <include name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" type="BINDATA" /> + <include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" /> + <include name="IDR_MENU_PAGE" file="menu_page.png" type="BINDATA" /> + <include name="IDR_MENU_CHROME" file="menu_chrome.png" type="BINDATA" /> + <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="locationbg_readonly_center.png" type="BINDATA" /> + <include name="IDR_LOCATIONBG_POPUPMODE_EDGE" file="locationbg_readonly_edge.png" type="BINDATA" /> + <include name="IDR_HISTORY_SECTION" file="history_section.png" type="BINDATA" /> + <include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="BINDATA" /> + <include name="IDR_EXTENSIONS_SECTION" file="extensions_section.png" type="BINDATA" /> + <include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="BINDATA" /> + <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" /> + <include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" type="BINDATA" /> + <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDATA" /> + <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" /> + <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" /> + <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" /> + <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" /> + <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" /> + <include name="IDR_HOME" file="home.png" type="BINDATA" /> + <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" /> + <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" /> + <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" /> + <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="BINDATA" /> + <include name="IDR_MENU_PAGE_RTL" file="menu_page_rtl.png" type="BINDATA" /> + <include name="IDR_MENU_CHROME_RTL" file="menu_chrome_rtl.png" type="BINDATA" /> + <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begin.png" type="BINDATA" /> + <if expr="os != 'darwin'"> + <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" type="BINDATA" /> + </if> + <if expr="os == 'darwin'"> + <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.png" type="BINDATA" /> + </if> + <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA" /> <include name="IDR_OTR_ICON_STANDALONE" file="otr_icon_standalone.png" type="BINDATA" /> - <include name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" type="BINDATA" /> - <include name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" type="BINDATA" /> - <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" /> - <include name="IDR_RELOAD" file="reload.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" /> + <include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_RECENT_ICON" file="bookmark_manager_recent.png" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_SEARCH_ICON" file="bookmark_manager_search.png" type="BINDATA" /> + <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDATA" /> + <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BINDATA" /> + <include name="IDR_TAB_ALPHA_NANO_LEFT" file="tab_alpha_nano_left.png" type="BINDATA" /> + <include name="IDR_TAB_ALPHA_NANO_RIGHT" file="tab_alpha_nano_right.png" type="BINDATA" /> + + <include name="IDR_DOCK_MAX" file="dock_tab_max.png" type="BINDATA" /> + <include name="IDR_DOCK_HIGH" file="dock_tab_high.png" type="BINDATA" /> + <include name="IDR_DOCK_WIDE" file="dock_tab_wide.png" type="BINDATA" /> + <include name="IDR_BUBBLE_L" file="bubble_l.png" type="BINDATA" /> + <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" /> + <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" /> + <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" /> + <include name="IDR_BUBBLE_R" file="bubble_r.png" type="BINDATA" /> + <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" /> + <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" /> + <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" /> + <include name="IDR_BUBBLE_T_ARROW" file="bubble_t_arrow.png" type="BINDATA" /> + <include name="IDR_BUBBLE_B_ARROW" file="bubble_b_arrow.png" type="BINDATA" /> + <include name="IDR_BUBBLE_L_ARROW" file="bubble_l_arrow.png" type="BINDATA" /> + <include name="IDR_BUBBLE_R_ARROW" file="bubble_r_arrow.png" type="BINDATA" /> + <include name="IDR_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" /> + + <include name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="theme_tab_background_incognito.png" type="BINDATA" /> + <include name="IDR_THEME_TAB_BACKGROUND_V" file="theme_tab_background_glass.png" type="BINDATA" /> + <include name="IDR_THEME_NTP_BACKGROUND" file="ntp_background.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_OVERLAY" file="notused.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" type="BINDATA" /> + <include name="IDR_THEME_BUTTON_BACKGROUND" file="notused.png" type="BINDATA" /> + <include name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" type="BINDATA" /> + <include name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" type="BINDATA" /> + + <include name="IDR_FORWARD_MASK" file="forward_mask.png" type="BINDATA" /> + <include name="IDR_BACK_MASK" file="back_mask.png" type="BINDATA" /> + <include name="IDR_BUTTON_MASK" file="button_mask.png" type="BINDATA" /> + + <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" /> + <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="BINDATA" /> <include name="IDR_RESTORE_BUTTON_MASK" file="restore_button_mask.png" type="BINDATA" /> - <include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" /> - <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" type="BINDATA" /> + + <include name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.png" type="BINDATA" /> + + <!-- Desktop notifications --> + <include name="IDR_BALLOON_BORDER" file="balloon_frame.png" type="BINDATA" /> + <include name="IDR_BALLOON_SHELF" file="balloon_shelf.png" type="BINDATA" /> + <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" /> + <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" type="BINDATA" /> + <include name="IDR_BALLOON_WRENCH" file="balloon_wrench.png" type="BINDATA" /> + <include name="IDR_BALLOON_WRENCH_HOVER" file="balloon_wrench_hover.png" type="BINDATA" /> + <include name="IDR_BALLOON_OPTIONS_ARROW" file="balloon_options_arrow.png" type="BINDATA" /> + <include name="IDR_BALLOON_OPTIONS_ARROW_HOVER" file="balloon_options_arrow_hover.png" type="BINDATA" /> + <!-- Desktop notifications for ChromeOS--> + <if expr="pp_ifdef('chromeos')"> + <include name="IDR_NOTIFICATION_MENU" file="notification_menu.png" type="BINDATA" /> + </if> + + <include name="IDR_SIDETABS_SHADOW_TOP" file="sidetabs_shadow_top.png" type="BINDATA" /> + <include name="IDR_SIDETABS_SHADOW_MIDDLE" file="sidetabs_shadow_middle.png" type="BINDATA" /> + <include name="IDR_SIDETABS_SHADOW_BOTTOM" file="sidetabs_shadow_bottom.png" type="BINDATA" /> + + <include name="IDR_SIDETABS_NEW_TAB" file="sidetabs_new_tab.png" type="BINDATA" /> + + <!-- Upgrade notification --> + + <include name="IDR_UPGRADE_DOT_INACTIVE" file="upgrade_dot_inactive.png" type="BINDATA" /> + <include name="IDR_UPGRADE_DOT_ACTIVE" file="upgrade_dot_active.png" type="BINDATA" /> + + <!-- Geolocation --> + <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_icon.png" type="BINDATA" /> + <include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation_allowed_locationbar_icon.png" type="BINDATA" /> + <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_denied_locationbar_icon.png" type="BINDATA" /> + + <!-- First run --> <include name="IDR_SEARCH_ENGINE_DIALOG_TOP" file="search_engine_top.png" type="BINDATA" /> + <if expr="pp_ifdef('_google_chrome')"> - <include name="IDR_SEARCH_ENGINE_LOGO_ASK" file="google_chrome/search_ask.png" type="BINDATA" /> + <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_background.png" type="BINDATA" /> + <include name="IDR_ABOUT_BACKGROUND_RTL" file="google_chrome/about_background_rtl.png" type="BINDATA" /> + <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_background_color.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" /> + <include name="IDR_WIZARD_ICON" file="google_chrome/wizard_icon.png" type="BINDATA" /> + <include name="IDR_WIZARD_ICON_RTL" file="google_chrome/wizard_icon_rtl.png" type="BINDATA" /> + <include name="IDR_PRODUCT_ICON_32" file="google_chrome/google_chrome_icon_32.png" type="BINDATA" /> + <include name="IDR_INFOBAR_TRANSLATE" file="google_chrome/infobar_translate.png" type="BINDATA" /> + <include name="IDR_SEARCH_ENGINE_LOGO_GOOGLE" file="google_chrome/search_google.png" type="BINDATA" /> + <include name="IDR_SEARCH_ENGINE_LOGO_YAHOO" file="google_chrome/search_yahoo.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_BING" file="google_chrome/search_bing.png" type="BINDATA" /> + <include name="IDR_SEARCH_ENGINE_LOGO_ASK" file="google_chrome/search_ask.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_CENTRUMCZ" file="google_chrome/search_centrumcz.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_GOO" file="google_chrome/search_goo.png" type="BINDATA" /> - <include name="IDR_SEARCH_ENGINE_LOGO_GOOGLE" file="google_chrome/search_google.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_MAILRU" file="google_chrome/search_mailru.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_NETSPRINT" file="google_chrome/search_netsprint.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_SEZNAM" file="google_chrome/search_seznam.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_VIRGILIO" file="google_chrome/search_virgilio.png" type="BINDATA" /> - <include name="IDR_SEARCH_ENGINE_LOGO_YAHOO" file="google_chrome/search_yahoo.png" type="BINDATA" /> - <include name="IDR_SEARCH_ENGINE_LOGO_YAHOOJP" file="google_chrome/search_yahoojp.png" type="BINDATA" /> + <include name="IDR_SEARCH_ENGINE_LOGO_YAHOOJP" file="google_chrome/search_yahoojp.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_YANDEX" file="google_chrome/search_yandex.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('_google_chrome')"> - <include name="IDR_SEARCH_ENGINE_LOGO_ASK" file="notused.png" type="BINDATA" /> + <include name="IDR_ABOUT_BACKGROUND" file="chromium/about_background.png" type="BINDATA" /> + <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background_rtl.png" type="BINDATA" /> + <include name="IDR_ABOUT_BACKGROUND_COLOR" file="chromium/about_background_color.png" type="BINDATA" /> + <include name="IDR_LOGIN_BACKGROUND" file="chromium/login_background.png" type="BINDATA" /> + <include name="IDR_LOGIN_PANEL" file="chromium/login_panel.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" /> + <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BINDATA" /> + <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> + <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" /> + <include name="IDR_INFOBAR_TRANSLATE" file="chromium/infobar_translate.png" type="BINDATA" /> + <include name="IDR_SEARCH_ENGINE_LOGO_GOOGLE" file="notused.png" type="BINDATA" /> + <include name="IDR_SEARCH_ENGINE_LOGO_YAHOO" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_BING" file="notused.png" type="BINDATA" /> + <include name="IDR_SEARCH_ENGINE_LOGO_ASK" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_CENTRUMCZ" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_GOO" file="notused.png" type="BINDATA" /> - <include name="IDR_SEARCH_ENGINE_LOGO_GOOGLE" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_MAILRU" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_NETSPRINT" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_SEZNAM" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_VIRGILIO" file="notused.png" type="BINDATA" /> - <include name="IDR_SEARCH_ENGINE_LOGO_YAHOO" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_YAHOOJP" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_YANDEX" file="notused.png" type="BINDATA" /> </if> - <include name="IDR_SIDETABS_NEW_TAB" file="sidetabs_new_tab.png" type="BINDATA" /> - <include name="IDR_SIDETABS_SHADOW_BOTTOM" file="sidetabs_shadow_bottom.png" type="BINDATA" /> - <include name="IDR_SIDETABS_SHADOW_MIDDLE" file="sidetabs_shadow_middle.png" type="BINDATA" /> - <include name="IDR_SIDETABS_SHADOW_TOP" file="sidetabs_shadow_top.png" type="BINDATA" /> + <if expr="pp_ifdef('_google_chrome') and (os == 'darwin')"> <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22_mono.png" type="BINDATA" /> <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/product_logo_22_mono_invert.png" type="BINDATA" /> @@ -354,121 +414,26 @@ <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.png" type="BINDATA" /> <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_logo_22.png" type="BINDATA" /> </if> - <include name="IDR_STOP" file="stop.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_NANO_CENTER" file="tab_active_nano_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_NANO_LEFT" file="tab_active_nano_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_NANO_RIGHT" file="tab_active_nano_right.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_NANO_LEFT" file="tab_alpha_nano_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_NANO_RIGHT" file="tab_alpha_nano_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_DOT_MASK" file="tab_close_dot_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" /> - <include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" /> - <include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_NANO_CENTER" file="tab_inactive_nano_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_NANO_LEFT" file="tab_inactive_nano_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_NANO_RIGHT" file="tab_inactive_nano_right.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type="BINDATA" /> - <include name="IDR_THEME_BUTTON_BACKGROUND" file="notused.png" type="BINDATA" /> + <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive2.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito2.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive2.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')"> - <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive.png" type="BINDATA" /> - </if> - <include name="IDR_THEME_FRAME_OVERLAY" file="notused.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" type="BINDATA" /> - <include name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" type="BINDATA" /> - <include name="IDR_THEME_NTP_BACKGROUND" file="ntp_background.png" type="BINDATA" /> - <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')"> - <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" /> - </if> - <include name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="theme_tab_background_incognito.png" type="BINDATA" /> - <include name="IDR_THEME_TAB_BACKGROUND_V" file="theme_tab_background_glass.png" type="BINDATA" /> - <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> + <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive2.png" type="BINDATA" /> <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')"> - <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" /> - </if> - <include name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" type="BINDATA" /> - <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA" /> - <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" /> - <include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" type="BINDATA" /> - <include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" /> - <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" /> - <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDATA" /> - <include name="IDR_UPGRADE_DOT_ACTIVE" file="upgrade_dot_active.png" type="BINDATA" /> - <include name="IDR_UPGRADE_DOT_INACTIVE" file="upgrade_dot_inactive.png" type="BINDATA" /> - <include name="IDR_WARNING" file="alert_small.png" type="BINDATA" /> - <if expr="pp_ifdef('_google_chrome')"> - <include name="IDR_WIZARD_ICON" file="google_chrome/wizard_icon.png" type="BINDATA" /> - <include name="IDR_WIZARD_ICON_RTL" file="google_chrome/wizard_icon_rtl.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('_google_chrome')"> - <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BINDATA" /> - <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> - </if> - - <if expr="pp_ifdef('chromeos')"> - <include name="IDR_NOTIFICATION_MENU" file="notification_menu.png" type="BINDATA" /> - </if> + <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito2.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive2.png" type="BINDATA" /> - <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> <include name="IDR_COMPACTNAV_BACK" file="compactnav_back.png" type="BINDATA" /> <include name="IDR_COMPACTNAV_FORWARD" file="compactnav_forward.png" type="BINDATA" /> <include name="IDR_COMPACTNAV_SEPARATOR" file="compactnav_separator.png" type="BINDATA" /> - <include name="IDR_FILEBROWSER_BACK" file="filebrowse_back.png" type="BINDATA" /> - <include name="IDR_FILEBROWSER_FULLSCREEN" file="filebrowse_fullscreen.png" type="BINDATA" /> - <include name="IDR_FILEBROWSER_FWD" file="filebrowse_forward.png" type="BINDATA" /> - <include name="IDR_FILEBROWSER_MENU" file="filebrowse_menu.png" type="BINDATA" /> - <include name="IDR_FILEBROWSER_UPLOAD" file="filebrowse_upload.png" type="BINDATA" /> - <include name="IDR_ICON_APP" file="icon_app.png" type="BINDATA" /> - <include name="IDR_ICON_FILE" file="icon_file.png" type="BINDATA" /> - <include name="IDR_ICON_FOLDER" file="icon_folder.png" type="BINDATA" /> - <include name="IDR_ICON_MEDIA" file="icon_media.png" type="BINDATA" /> - <include name="IDR_ICON_PHOTO" file="icon_photo.png" type="BINDATA" /> - <include name="IDR_ICON_WEBPAGE" file="icon_webpage.png" type="BINDATA" /> - <include name="IDR_LOGIN_DEFAULT_USER" file="login_default.png" type="BINDATA" /> - <include name="IDR_LOGIN_OTHER_USER" file="login_other.png" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_FULL_SCREEN" file="mediaplayer_full_screen.png" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_MENU" file="mediaplayer_menu.png" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_NEXT" file="mediaplayer_next.png" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_PAUSE" file="mediaplayer_pause.png" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_PLAY" file="mediaplayer_play.png" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_PLAYLIST" file="mediaplayer_playlist.png" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_PREV" file="mediaplayer_prev.png" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_VOL_HIGH" file="mediaplayer_vol_high.png" type="BINDATA" /> - <include name="IDR_NOTIFICATION_LOW_BATTERY" file="notification_battery_low.png" type="BINDATA" /> - <include name="IDR_NOTIFICATION_NETWORK_FAILED" file="notification_network_failed.png" type="BINDATA" /> - <include name="IDR_NOTIFICATION_NETWORK_OPEN" file="notification_network_open.png" type="BINDATA" /> - <include name="IDR_NOTIFICATION_NETWORK_WARNING" file="notification_network_warning.png" type="BINDATA" /> + <include name="IDR_SPINNER" file="spinner.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_MENU" file="statusbar_menu.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_CHARGED" file="statusbar_battery_charged.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_MISSING" file="statusbar_battery_missing.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_PRESSED" file="statusbar_battery_pressed.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_UNKNOWN" file="statusbar_battery_unknown.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_CHARGING_1" file="statusbar_battery1c.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_CHARGING_10" file="statusbar_battery10c.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_CHARGING_11" file="statusbar_battery11c.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_CHARGING_12" file="statusbar_battery12c.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_CHARGING_2" file="statusbar_battery2c.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_CHARGING_3" file="statusbar_battery3c.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_CHARGING_4" file="statusbar_battery4c.png" type="BINDATA" /> @@ -477,10 +442,10 @@ <include name="IDR_STATUSBAR_BATTERY_CHARGING_7" file="statusbar_battery7c.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_CHARGING_8" file="statusbar_battery8c.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_CHARGING_9" file="statusbar_battery9c.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_CHARGING_10" file="statusbar_battery10c.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_CHARGING_11" file="statusbar_battery11c.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_CHARGING_12" file="statusbar_battery12c.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_1" file="statusbar_battery1d.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_10" file="statusbar_battery10d.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_11" file="statusbar_battery11d.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_12" file="statusbar_battery12d.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_2" file="statusbar_battery2d.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_3" file="statusbar_battery3d.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_4" file="statusbar_battery4d.png" type="BINDATA" /> @@ -489,50 +454,78 @@ <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_7" file="statusbar_battery7d.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_8" file="statusbar_battery8d.png" type="BINDATA" /> <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_9" file="statusbar_battery9d.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_MISSING" file="statusbar_battery_missing.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_PRESSED" file="statusbar_battery_pressed.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_BATTERY_UNKNOWN" file="statusbar_battery_unknown.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_FEEDBACK" file="statusbar_feedback.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_FEEDBACK_PRESSED" file="statusbar_feedback_pressed.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_MENU" file="statusbar_menu.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_3G" file="statusbar_network_3g.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_10" file="statusbar_battery10d.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_11" file="statusbar_battery11d.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_12" file="statusbar_battery12d.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS0" file="statusbar_network_bars0.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS0_BLACK" file="statusbar_network_bars0b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS1" file="statusbar_network_bars1.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS1_BLACK" file="statusbar_network_bars1b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS2" file="statusbar_network_bars2.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS2_BLACK" file="statusbar_network_bars2b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS3" file="statusbar_network_bars3.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS3_BLACK" file="statusbar_network_bars3b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS4" file="statusbar_network_bars4.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS4_BLACK" file="statusbar_network_bars4b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS5" file="statusbar_network_bars5.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS5_BLACK" file="statusbar_network_bars5b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS6" file="statusbar_network_bars6.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS6_BLACK" file="statusbar_network_bars6b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS7" file="statusbar_network_bars7.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS7_BLACK" file="statusbar_network_bars7b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS8" file="statusbar_network_bars8.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS8_BLACK" file="statusbar_network_bars8b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS9" file="statusbar_network_bars9.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS0_BLACK" file="statusbar_network_bars0b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS1_BLACK" file="statusbar_network_bars1b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS2_BLACK" file="statusbar_network_bars2b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS3_BLACK" file="statusbar_network_bars3b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS4_BLACK" file="statusbar_network_bars4b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS5_BLACK" file="statusbar_network_bars5b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS6_BLACK" file="statusbar_network_bars6b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS7_BLACK" file="statusbar_network_bars7b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS8_BLACK" file="statusbar_network_bars8b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS9_BLACK" file="statusbar_network_bars9b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_BARS_PRESSED" file="statusbar_network_bars_pressed.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_DISCONNECTED" file="statusbar_network_disconnected.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_EDGE" file="statusbar_network_edge.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_SECURE" file="statusbar_network_secure.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_WARNING" file="statusbar_network_warning.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_SECURE" file="statusbar_network_secure.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_EDGE" file="statusbar_network_edge.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_3G" file="statusbar_network_3g.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_WIRED_PRESSED" file="statusbar_network_wired_pressed.png" type="BINDATA" /> <include name="IDR_STATUSBAR_WIRED" file="statusbar_wired.png" type="BINDATA" /> <include name="IDR_STATUSBAR_WIRED_BLACK" file="statusbar_wiredb.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_FEEDBACK" file="statusbar_feedback.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_FEEDBACK_PRESSED" file="statusbar_feedback_pressed.png" type="BINDATA" /> <include name="IDR_STATUSBAR_WIRED_BLACK" file="statusbar_wiredb.png" type="BINDATA" /> + <include name="IDR_FILEBROWSER_BACK" file="filebrowse_back.png" type="BINDATA" /> + <include name="IDR_FILEBROWSER_FWD" file="filebrowse_forward.png" type="BINDATA" /> + <include name="IDR_ICON_APP" file="icon_app.png" type="BINDATA" /> + <include name="IDR_ICON_FILE" file="icon_file.png" type="BINDATA" /> + <include name="IDR_ICON_FOLDER" file="icon_folder.png" type="BINDATA" /> + <include name="IDR_ICON_MEDIA" file="icon_media.png" type="BINDATA" /> + <include name="IDR_ICON_PHOTO" file="icon_photo.png" type="BINDATA" /> + <include name="IDR_ICON_WEBPAGE" file="icon_webpage.png" type="BINDATA" /> + <include name="IDR_FILEBROWSER_UPLOAD" file="filebrowse_upload.png" type="BINDATA" /> + <include name="IDR_FILEBROWSER_FULLSCREEN" file="filebrowse_fullscreen.png" type="BINDATA" /> + <include name="IDR_FILEBROWSER_MENU" file="filebrowse_menu.png" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_PLAY" file="mediaplayer_play.png" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_PAUSE" file="mediaplayer_pause.png" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_NEXT" file="mediaplayer_next.png" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_PREV" file="mediaplayer_prev.png" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_MENU" file="mediaplayer_menu.png" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_VOL_HIGH" file="mediaplayer_vol_high.png" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_FULL_SCREEN" file="mediaplayer_full_screen.png" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_PLAYLIST" file="mediaplayer_playlist.png" type="BINDATA" /> + <include name="IDR_NOTIFICATION_LOW_BATTERY" file="notification_battery_low.png" type="BINDATA" /> + <include name="IDR_NOTIFICATION_NETWORK_FAILED" file="notification_network_failed.png" type="BINDATA" /> + <include name="IDR_NOTIFICATION_NETWORK_OPEN" file="notification_network_open.png" type="BINDATA" /> + <include name="IDR_NOTIFICATION_NETWORK_WARNING" file="notification_network_warning.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER" file="login_default.png" type="BINDATA" /> + <include name="IDR_LOGIN_OTHER_USER" file="login_other.png" type="BINDATA" /> <include name="IDR_USER_IMAGE_NO_VIDEO" file="login_other.png" type="BINDATA" /> - <include name="IDR_VOLUMEBUBBLE_ICON" file="volume_icon.png" type="BINDATA" /> - </if> + <include name="IDR_VOLUMEBUBBLE_ICON" file="volume_icon.png" type="BINDATA" /> + </if> - <if expr="not pp_ifdef('_google_chrome')"> - <include name="IDR_LOGIN_BACKGROUND" file="chromium/login_background.png" type="BINDATA" /> - <include name="IDR_LOGIN_PANEL" file="chromium/login_panel.png" type="BINDATA" /> - </if> + <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')"> + <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" /> + <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive.png" type="BINDATA" /> + <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito.png" type="BINDATA" /> + <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" /> + </if> <if expr="not pp_ifdef('toolkit_views')"> <!-- The GTK interface needs these slightly modified images in diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 7de1fb4..743bc41 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -6,11 +6,13 @@ without changes to the corresponding grd file. eadee --> <output filename="grit/browser_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="browser_resources.pak" type="data_package" /> <output filename="browser_resources.rc" type="rc_all" /> + <output filename="browser_resources.pak" type="data_package" /> </outputs> <release seq="1"> <includes> + <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" /> + <if expr="os == 'linux2' or os.find('bsd') != -1"> <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux.html" flattenhtml="true" type="BINDATA" /> </if> @@ -20,56 +22,55 @@ without changes to the corresponding grd file. eadee --> <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1"> <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" /> </if> + <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" type="BINDATA" /> - <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadblock.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" /> + <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incognito_tab_theme.css" flattenhtml="true" type="BINDATA" /> + <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type="BINDATA" /> + <include name="IDR_NEW_NEW_TAB_JS" file="resources\new_new_tab.js" type="BINDATA" /> + <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_browsing_malware_block.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_browsing_phishing_block.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\safe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenhtml="true" type="BINDATA" /> + <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> + <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" /> + </if> + <include name="IDR_OPTIONS_HTML" file="resources\options.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_APP_GALLERY_ICON" file="resources\app_gallery_icon.png" type="BINDATA" /> <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\manifest.json" type="BINDATA" /> + <include name="IDR_GMAIL_APP_MANIFEST" file="resources\gmail_app\manifest.json" type="BINDATA" /> <include name="IDR_CALENDAR_APP_MANIFEST" file="resources\calendar_app\manifest.json" type="BINDATA" /> - <include name="IDR_CHAT_MANAGER_MANIFEST" file="resources\chat_manager\manifest.json" type="BINDATA" /> - <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_DOCS_APP_MANIFEST" file="resources\docs_app\manifest.json" type="BINDATA" /> + <include name="IDR_CHAT_MANAGER_MANIFEST" file="resources\chat_manager\manifest.json" type="BINDATA" /> + <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_LOCAL_STRINGS_JS" file="resources\shared\js\local_strings.js" type="BINDATA" /> <include name="IDR_DOM_UI_CSS" file="resources\dom_ui.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_DOM_UI2_CSS" file="resources\dom_ui2.css" flattenhtml="true" type="BINDATA" /> - <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_EXTENSION_DEFAULT_ICON" file="resources\extension_default_icon.png" type="BINDATA" /> <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_infobar.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_EXTENSIONS_TOOLSTRIP_THEME_CSS" file="resources\extensions_toolstrip.css" flattenhtml="true" type="BINDATA" /> - <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_GMAIL_APP_MANIFEST" file="resources\gmail_app\manifest.json" type="BINDATA" /> - <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_LOCAL_STRINGS_JS" file="resources\shared\js\local_strings.js" type="BINDATA" /> - <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incognito_tab_theme.css" flattenhtml="true" type="BINDATA" /> - <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type="BINDATA" /> - <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_NEW_NEW_TAB_JS" file="resources\new_new_tab.js" type="BINDATA" /> - <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" /> - <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1line.html" type="BINDATA" /> - <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2line.html" type="BINDATA" /> - <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_icon.html" type="BINDATA" /> - <include name="IDR_OPTIONS_HTML" file="resources\options.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_browsing_malware_block.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\safe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_browsing_phishing_block.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadblock.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SYNC_CHOOSE_DATATYPES_HTML" file="sync\resources\choose_datatypes.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_icon.html" type="BINDATA" /> + <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2line.html" type="BINDATA" /> + <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1line.html" type="BINDATA" /> <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" /> - - <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> - <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flattenhtml="true" type="BINDATA" /> - </if> </includes> </release> </grit> diff --git a/chrome/browser/resources/bookmark_manager_resources.grd b/chrome/browser/resources/bookmark_manager_resources.grd index fb6b089..8a54565 100644 --- a/chrome/browser/resources/bookmark_manager_resources.grd +++ b/chrome/browser/resources/bookmark_manager_resources.grd @@ -6,27 +6,27 @@ without changes to the corresponding grd file. --> <output filename="grit/bookmark_manager_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="grit/bookmark_manager_resources_map.cc" type="resource_file_map_source" /> - <output filename="grit/bookmark_manager_resources_map.h" type="resource_map_header" /> <output filename="bookmark_manager_resources.pak" type="data_package" /> + <output filename="grit/bookmark_manager_resources_map.h" type="resource_map_header" /> + <output filename="grit/bookmark_manager_resources_map.cc" type="resource_file_map_source" /> </outputs> <release seq="1"> <includes> + <include name="IDR_BOOKMARK_MANAGER_TREE_ITERATOR_TEST" file="bookmark_manager/js/bmm/tree_iterator_test.html" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_TREE" file="bookmark_manager/js/bmm/bookmark_tree.js" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_TREE_ITERATOR" file="bookmark_manager/js/bmm/tree_iterator.js" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_LIST" file="bookmark_manager/js/bmm/bookmark_list.js" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_BMM_TEST" file="bookmark_manager/js/bmm_test.html" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_MANIFEST_JSON" file="bookmark_manager/manifest.json" type="BINDATA" /> <include name="IDR_BOOKMARK_MANAGER_BMM_CSS" file="bookmark_manager/css/bmm.css" type="BINDATA" /> <include name="IDR_BOOKMARK_MANAGER_BMM_CSS_JS" file="bookmark_manager/css/bmm.css.js" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_BMM_TEST" file="bookmark_manager/js/bmm_test.html" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_LIST" file="bookmark_manager/js/bmm/bookmark_list.js" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_RECENT" file="bookmark_manager/images/bookmark_manager_recent.png" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_SECTION_32" file="bookmark_manager/images/bookmarks_section_32.png" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_SECTION" file="bookmark_manager/images/bookmarks_section.png" type="BINDATA" /> <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_SEARCH" file="bookmark_manager/images/bookmark_manager_search.png" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_TREE" file="bookmark_manager/js/bmm/bookmark_tree.js" type="BINDATA" /> <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_FAVICON" file="bookmark_manager/images/bookmarks_favicon.png" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_SECTION" file="bookmark_manager/images/bookmarks_section.png" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_SECTION_32" file="bookmark_manager/images/bookmarks_section_32.png" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_MANIFEST_JSON" file="bookmark_manager/manifest.json" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_TREE_ITERATOR" file="bookmark_manager/js/bmm/tree_iterator.js" type="BINDATA" /> - <include name="IDR_BOOKMARK_MANAGER_TREE_ITERATOR_TEST" file="bookmark_manager/js/bmm/tree_iterator_test.html" type="BINDATA" /> + <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_RECENT" file="bookmark_manager/images/bookmark_manager_recent.png" type="BINDATA" /> </includes> </release> </grit> diff --git a/chrome/browser/resources/net_internals_resources.grd b/chrome/browser/resources/net_internals_resources.grd index 93a73b7..2ed151a 100644 --- a/chrome/browser/resources/net_internals_resources.grd +++ b/chrome/browser/resources/net_internals_resources.grd @@ -6,9 +6,9 @@ without changes to the corresponding grd file. --> <output filename="grit/net_internals_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="grit/net_internals_resources_map.cc" type="resource_file_map_source" /> - <output filename="grit/net_internals_resources_map.h" type="resource_map_header" /> <output filename="net_internals_resources.pak" type="data_package" /> + <output filename="grit/net_internals_resources_map.h" type="resource_map_header" /> + <output filename="grit/net_internals_resources_map.cc" type="resource_file_map_source" /> </outputs> <release seq="1"> <includes> @@ -19,8 +19,8 @@ without changes to the corresponding grd file. --> <include name="IDR_NET_INTERNALS_INDEX_HTML" file="net_internals/index.html" type="BINDATA" /> <include name="IDR_NET_INTERNALS_LOGGROUPER" file="net_internals/loggrouper.js" type="BINDATA" /> <include name="IDR_NET_INTERNALS_LOGVIEWPAINTER" file="net_internals/logviewpainter.js" type="BINDATA" /> - <include name="IDR_NET_INTERNALS_MAIN" file="net_internals/main.js" type="BINDATA" /> <include name="IDR_NET_INTERNALS_MAIN_CSS" file="net_internals/main.css" type="BINDATA" /> + <include name="IDR_NET_INTERNALS_MAIN" file="net_internals/main.js" type="BINDATA" /> <include name="IDR_NET_INTERNALS_PROXYVIEW" file="net_internals/proxyview.js" type="BINDATA" /> <include name="IDR_NET_INTERNALS_REQUESTSVIEW" file="net_internals/requestsview.js" type="BINDATA" /> <include name="IDR_NET_INTERNALS_RESIZABLEVERTICALSPLITVIEW" file="net_internals/resizableverticalsplitview.js" type="BINDATA" /> diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd index 12a8b4a..322b1c2 100644 --- a/chrome/browser/resources/shared_resources.grd +++ b/chrome/browser/resources/shared_resources.grd @@ -6,12 +6,13 @@ without changes to the corresponding grd file. paaaae --> <output filename="grit/shared_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="grit/shared_resources_map.cc" type="resource_file_map_source" /> - <output filename="grit/shared_resources_map.h" type="resource_map_header" /> <output filename="shared_resources.pak" type="data_package" /> + <output filename="grit/shared_resources_map.h" type="resource_map_header" /> + <output filename="grit/shared_resources_map.cc" type="resource_file_map_source" /> </outputs> <release seq="1"> <includes> + <!-- shared/css/ --> <include name="IDR_SHARED_CSS_BUTTON" file="shared/css/button.css" type="BINDATA" /> <include name="IDR_SHARED_CSS_LIST" @@ -22,10 +23,22 @@ without changes to the corresponding grd file. paaaae --> file="shared/css/tree.css" type="BINDATA" /> <include name="IDR_SHARED_CSS_TREE_JS" file="shared/css/tree.css.js" type="BINDATA" /> + + <!-- shared/js/ --> <include name="IDR_SHARED_JS_CLASS_LIST" file="shared/js/class_list.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR" file="shared/js/cr.js" type="BINDATA" /> + <include name="IDR_SHARED_JS_I18N_TEMPLATE" + file="shared/js/i18n_template.js" type="BINDATA" /> + <include name="IDR_SHARED_JS_LOCAL_STRINGS" + file="shared/js/local_strings.js" type="BINDATA" /> + <include name="IDR_SHARED_JS_PARSE_HTML_SUBSET" + file="shared/js/parse_html_subset.js" type="BINDATA" /> + <include name="IDR_SHARED_JS_UTIL" + file="shared/js/util.js" type="BINDATA" /> + + <!-- shared/js/cr --> <include name="IDR_SHARED_JS_CR_EVENT_TARGET" file="shared/js/cr/event_target.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_LINK_CONTROLLER" @@ -34,6 +47,8 @@ without changes to the corresponding grd file. paaaae --> file="shared/js/cr/promise.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI" file="shared/js/cr/ui.js" type="BINDATA" /> + + <!-- shared/js/cr/ui --> <include name="IDR_SHARED_JS_CR_UI_ARRAY_DATA_MODEL" file="shared/js/cr/ui/array_data_model.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_COMMAND" @@ -42,32 +57,24 @@ without changes to the corresponding grd file. paaaae --> file="shared/js/cr/ui/context_menu_button.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_CONTEXT_MENU_HANDLER" file="shared/js/cr/ui/context_menu_handler.js" type="BINDATA" /> - <include name="IDR_SHARED_JS_CR_UI_LIST" - file="shared/js/cr/ui/list.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_LIST_ITEM" file="shared/js/cr/ui/list_item.js" type="BINDATA" /> + <include name="IDR_SHARED_JS_CR_UI_LIST" + file="shared/js/cr/ui/list.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_LIST_SELECTION_MODEL" file="shared/js/cr/ui/list_selection_model.js" type="BINDATA" /> - <include name="IDR_SHARED_JS_CR_UI_MENU" - file="shared/js/cr/ui/menu.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_MENU_BUTTON" file="shared/js/cr/ui/menu_button.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_MENU_ITEM" file="shared/js/cr/ui/menu_item.js" type="BINDATA" /> + <include name="IDR_SHARED_JS_CR_UI_MENU" + file="shared/js/cr/ui/menu.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_POSITION_UTIL" file="shared/js/cr/ui/position_util.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_SPLITTER" file="shared/js/cr/ui/splitter.js" type="BINDATA" /> <include name="IDR_SHARED_JS_CR_UI_TREE" file="shared/js/cr/ui/tree.js" type="BINDATA" /> - <include name="IDR_SHARED_JS_I18N_TEMPLATE" - file="shared/js/i18n_template.js" type="BINDATA" /> - <include name="IDR_SHARED_JS_LOCAL_STRINGS" - file="shared/js/local_strings.js" type="BINDATA" /> - <include name="IDR_SHARED_JS_PARSE_HTML_SUBSET" - file="shared/js/parse_html_subset.js" type="BINDATA" /> - <include name="IDR_SHARED_JS_UTIL" - file="shared/js/util.js" type="BINDATA" /> </includes> </release> </grit> diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd index ea1b784..6dda963 100644 --- a/chrome/common/common_resources.grd +++ b/chrome/common/common_resources.grd @@ -4,14 +4,14 @@ <output filename="grit/common_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="common_resources.pak" type="data_package" /> <output filename="common_resources.rc" type="rc_all" /> + <output filename="common_resources.pak" type="data_package" /> </outputs> <release seq="1"> <includes> - <include name="IDR_EXTENSION_API_JSON" file="extensions\api\extension_api.json" type="BINDATA" /> - <include name="IDR_I18N_TEMPLATE_JS" file="..\browser\resources\shared\js\i18n_template.js" type="BINDATA" /> <include name="IDR_JSTEMPLATE_JS" file="..\third_party\jstemplate\jstemplate_compiled.js" type="BINDATA" /> + <include name="IDR_I18N_TEMPLATE_JS" file="..\browser\resources\shared\js\i18n_template.js" type="BINDATA" /> + <include name="IDR_EXTENSION_API_JSON" file="extensions\api\extension_api.json" type="BINDATA" /> </includes> </release> </grit> diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd index 2db6147..ac2f91c 100644 --- a/chrome/renderer/renderer_resources.grd +++ b/chrome/renderer/renderer_resources.grd @@ -6,24 +6,24 @@ without changes to the corresponding grd file. fb9 --> <output filename="grit/renderer_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="renderer_resources.pak" type="data_package" /> <output filename="renderer_resources.rc" type="rc_all" /> + <output filename="renderer_resources.pak" type="data_package" /> </outputs> <release seq="1"> <includes> - <include name="IDR_BASE_JS" file="resources\base.js" type="BINDATA" /> - <include name="IDR_DOM_AUTOMATION_JS" file="resources\dom_automation.js" type="BINDATA" /> <include name="IDR_ERROR_NO_DETAILS_HTML" file="resources\error_no_details.html" type="BINDATA" /> <include name="IDR_EVENT_BINDINGS_JS" file="resources\event_bindings.js" type="BINDATA" /> - <include name="IDR_EXTENSION_APITEST_JS" file="resources\extension_apitest.js" type="BINDATA" /> <include name="IDR_EXTENSION_PROCESS_BINDINGS_JS" file="resources\extension_process_bindings.js" type="BINDATA" /> - <include name="IDR_EXTENSION_TOOLSTRIP_CSS" file="resources\extension_toolstrip.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_GREASEMONKEY_API_JS" file="resources\greasemonkey_api.js" type="BINDATA" /> <include name="IDR_INSECURE_CONTENT_STAMP" file="resources\insecure_content_stamp.png" type="BINDATA" /> <include name="IDR_JSON_SCHEMA_JS" file="resources\json_schema.js" type="BINDATA" /> <include name="IDR_NET_ERROR_HTML" file="resources\neterror.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_RENDERER_EXTENSION_BINDINGS_JS" file="resources\renderer_extension_bindings.js" type="BINDATA" /> <include name="IDR_SAD_PLUGIN" file="resources\sadplugin.png" type="BINDATA" /> + <include name="IDR_EXTENSION_APITEST_JS" file="resources\extension_apitest.js" type="BINDATA" /> + <include name="IDR_EXTENSION_TOOLSTRIP_CSS" file="resources\extension_toolstrip.css" flattenhtml="true" type="BINDATA" /> + <include name="IDR_DOM_AUTOMATION_JS" file="resources\dom_automation.js" type="BINDATA" /> + <include name="IDR_BASE_JS" file="resources\base.js" type="BINDATA" /> </includes> </release> </grit> diff --git a/chrome_frame/resources/chrome_frame_resources.grd b/chrome_frame/resources/chrome_frame_resources.grd index 831840c..f9d9a7f 100644 --- a/chrome_frame/resources/chrome_frame_resources.grd +++ b/chrome_frame/resources/chrome_frame_resources.grd @@ -16,8 +16,8 @@ for localizable strings <output filename="grit/chrome_frame_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="chrome_frame_resources.pak" type="data_package" /> <output filename="chrome_frame_resources.rc" type="rc_all" lang="en"/> + <output filename="chrome_frame_resources.pak" type="data_package" /> </outputs> <release seq="1"> <structures first_id="50005"> @@ -26,11 +26,12 @@ for localizable strings </structures> <includes> <include name="IDR_BHO" file="../bho.rgs" type="REGISTRY" /> - <include name="IDR_CHROMEACTIVEDOCUMENT" file="../chrome_active_document.rgs" type="REGISTRY" /> + <include name="IDR_CHROMETAB" file="../chrome_tab.rgs" type="REGISTRY" /> + <include name="IDR_CHROMEPROTOCOL" file="../chrome_protocol.rgs" type="REGISTRY" /> + <include name="IDR_CHROMEACTIVEDOCUMENT" file="../chrome_active_document.rgs" + type="REGISTRY" /> <include name="IDR_CHROMEFRAME_ACTIVEX" file="../chrome_frame_activex.rgs" type="REGISTRY" /> <include name="IDR_CHROMEFRAME_NPAPI" file="../chrome_frame_npapi.rgs" type="REGISTRY" /> - <include name="IDR_CHROMEPROTOCOL" file="../chrome_protocol.rgs" type="REGISTRY" /> - <include name="IDR_CHROMETAB" file="../chrome_tab.rgs" type="REGISTRY" /> </includes> </release> </grit> diff --git a/net/base/net_resources.grd b/net/base/net_resources.grd index 327778a..f64dd60 100644 --- a/net/base/net_resources.grd +++ b/net/base/net_resources.grd @@ -4,8 +4,8 @@ <output filename="grit/net_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="net_resources.pak" type="data_package" /> <output filename="net_resources.rc" type="rc_all" /> + <output filename="net_resources.pak" type="data_package" /> </outputs> <translations /> <release seq="1"> diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index a2146fd..890f5e6 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -4,61 +4,62 @@ <output filename="grit/webkit_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="webkit_resources.pak" type="data_package" /> <output filename="webkit_resources.rc" type="rc_all" /> + <output filename="webkit_resources.pak" type="data_package" /> </outputs> <release seq="1"> <includes> - <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" /> <include name="IDR_BROKENIMAGE" file="resources\broken-image.gif" type="BINDATA" /> - <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" /> - <include name="IDC_COLRESIZE" file="resources\col_resize.cur" type="CURSOR" /> - <include name="IDC_COPYCUR" file="resources\copy.cur" type="CURSOR" /> - <include name="IDR_MEDIA_PAUSE_BUTTON" file="resources\media_pause.png" type="BINDATA" /> - <include name="IDR_MEDIA_PLAY_BUTTON" file="resources\media_play.png" type="BINDATA" /> - <include name="IDR_MEDIA_PLAY_BUTTON_DISABLED" file="resources\media_play_disabled.png" type="BINDATA" /> - <include name="IDR_MEDIA_SOUND_DISABLED" file="resources\media_sound_disabled.png" type="BINDATA" /> - <include name="IDR_MEDIA_SOUND_FULL_BUTTON" file="resources\media_sound_full.png" type="BINDATA" /> - <include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" /> - <include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" /> - <include name="IDR_MEDIA_VOLUME_SLIDER_THUMB" file="resources\media_volume_slider_thumb.png" type="BINDATA" /> - <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" /> - <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" /> - <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" /> - <include name="IDC_PAN_NORTH_EAST" file="resources\pan_north_east.cur" type="CURSOR" /> - <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" /> + <include name="IDR_TICKMARK_DASH" file="resources\dash.png" type="BINDATA" /> <include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" /> - <include name="IDC_PAN_SOUTH" file="resources\pan_south.cur" type="CURSOR" /> - <include name="IDC_PAN_SOUTH_EAST" file="resources\pan_south_east.cur" type="CURSOR" /> - <include name="IDC_PAN_SOUTH_WEST" file="resources\pan_south_west.cur" type="CURSOR" /> - <include name="IDC_PAN_WEST" file="resources\pan_west.cur" type="CURSOR" /> - <include name="IDC_ROWRESIZE" file="resources\row_resize.cur" type="CURSOR" /> <include name="IDR_SEARCH_CANCEL" file="resources\search_cancel.png" type="BINDATA" /> <include name="IDR_SEARCH_CANCEL_PRESSED" file="resources\search_cancel_pressed.png" type="BINDATA" /> <include name="IDR_SEARCH_MAGNIFIER" file="resources\search_magnifier.png" type="BINDATA" /> <include name="IDR_SEARCH_MAGNIFIER_RESULTS" file="resources\search_magnifier_results.png" type="BINDATA" /> <include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" /> - <include name="IDR_TICKMARK_DASH" file="resources\dash.png" type="BINDATA" /> - <include name="IDC_VERTICALTEXT" file="resources\vertical_text.cur" type="CURSOR" /> - <include name="IDC_ZOOMIN" file="resources\zoom_in.cur" type="CURSOR" /> - <include name="IDC_ZOOMOUT" file="resources\zoom_out.cur" type="CURSOR" /> + <include name="IDR_MEDIA_PLAY_BUTTON" file="resources\media_play.png" type="BINDATA" /> + <include name="IDR_MEDIA_PLAY_BUTTON_DISABLED" file="resources\media_play_disabled.png" type="BINDATA" /> + <include name="IDR_MEDIA_PAUSE_BUTTON" file="resources\media_pause.png" type="BINDATA" /> + <include name="IDR_MEDIA_SOUND_FULL_BUTTON" file="resources\media_sound_full.png" type="BINDATA" /> + <include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" /> + <include name="IDR_MEDIA_SOUND_DISABLED" file="resources\media_sound_disabled.png" type="BINDATA" /> + <include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" /> + <include name="IDR_MEDIA_VOLUME_SLIDER_THUMB" file="resources\media_volume_slider_thumb.png" type="BINDATA" /> <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> - <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_LINUX_CHECKBOX_DISABLED_OFF" file="resources\linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_LINUX_CHECKBOX_DISABLED_ON" file="resources\linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_LINUX_CHECKBOX_INDETERMINATE" file="resources\linux-checkbox-indeterminate.png" type="BINDATA" /> <include name="IDR_LINUX_CHECKBOX_OFF" file="resources\linux-checkbox-off.png" type="BINDATA" /> <include name="IDR_LINUX_CHECKBOX_ON" file="resources\linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_LINUX_RADIO_DISABLED_OFF" file="resources\linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_LINUX_RADIO_DISABLED_ON" file="resources\linux-radio-disabled-on.png" type="BINDATA" /> + <include name="IDR_LINUX_CHECKBOX_INDETERMINATE" file="resources\linux-checkbox-indeterminate.png" type="BINDATA" /> + <include name="IDR_LINUX_CHECKBOX_DISABLED_OFF" file="resources\linux-checkbox-disabled-off.png" type="BINDATA" /> + <include name="IDR_LINUX_CHECKBOX_DISABLED_ON" file="resources\linux-checkbox-disabled-on.png" type="BINDATA" /> + <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> <include name="IDR_LINUX_RADIO_OFF" file="resources\linux-radio-off.png" type="BINDATA" /> <include name="IDR_LINUX_RADIO_ON" file="resources\linux-radio-on.png" type="BINDATA" /> + <include name="IDR_LINUX_RADIO_DISABLED_OFF" file="resources\linux-radio-disabled-off.png" type="BINDATA" /> + <include name="IDR_LINUX_RADIO_DISABLED_ON" file="resources\linux-radio-disabled-on.png" type="BINDATA" /> <include name="IDR_PROGRESS_BAR" file="resources\linux-progress-bar.png" type="BINDATA" /> + <include name="IDR_PROGRESS_VALUE" file="resources\linux-progress-value.png" type="BINDATA" /> <include name="IDR_PROGRESS_BORDER_LEFT" file="resources\linux-progress-border-left.png" type="BINDATA" /> <include name="IDR_PROGRESS_BORDER_RIGHT" file="resources\linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="resources\linux-progress-value.png" type="BINDATA" /> </if> + + <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" /> + <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" /> + <include name="IDC_COLRESIZE" file="resources\col_resize.cur" type="CURSOR" /> + <include name="IDC_COPYCUR" file="resources\copy.cur" type="CURSOR" /> + <include name="IDC_ROWRESIZE" file="resources\row_resize.cur" type="CURSOR" /> + <include name="IDC_VERTICALTEXT" file="resources\vertical_text.cur" type="CURSOR" /> + <include name="IDC_ZOOMIN" file="resources\zoom_in.cur" type="CURSOR" /> + <include name="IDC_ZOOMOUT" file="resources\zoom_out.cur" type="CURSOR" /> + <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" /> + <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" /> + <include name="IDC_PAN_NORTH_EAST" file="resources\pan_north_east.cur" type="CURSOR" /> + <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" /> + <include name="IDC_PAN_SOUTH_EAST" file="resources\pan_south_east.cur" type="CURSOR" /> + <include name="IDC_PAN_SOUTH" file="resources\pan_south.cur" type="CURSOR" /> + <include name="IDC_PAN_SOUTH_WEST" file="resources\pan_south_west.cur" type="CURSOR" /> + <include name="IDC_PAN_WEST" file="resources\pan_west.cur" type="CURSOR" /> + <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" /> </includes> </release> </grit> diff --git a/webkit/tools/test_shell/test_shell_resources.grd b/webkit/tools/test_shell/test_shell_resources.grd index 09e9b34..8391859 100644 --- a/webkit/tools/test_shell/test_shell_resources.grd +++ b/webkit/tools/test_shell/test_shell_resources.grd @@ -8,9 +8,10 @@ </outputs> <release seq="1"> <includes> - <include name="IDR_AHEM_FONT" file="resources\AHEM____.TTF" type="BINDATA" /> <include name="IDR_BROKENIMAGE_TESTSHELL" file="resources\missingImage.gif" type="BINDATA" /> <include name="IDR_TEXTAREA_RESIZER_TESTSHELL" file="resources\textAreaResizeCorner.png" type="BINDATA" /> + + <include name="IDR_AHEM_FONT" file="resources\AHEM____.TTF" type="BINDATA" /> </includes> </release> </grit> |