diff options
93 files changed, 51 insertions, 74 deletions
diff --git a/chrome/app/theme/app_top_center.png b/chrome/app/theme/app_top_center.png Binary files differdeleted file mode 100644 index 46f8f96..0000000 --- a/chrome/app/theme/app_top_center.png +++ /dev/null diff --git a/chrome/app/theme/app_top_left.png b/chrome/app/theme/app_top_left.png Binary files differdeleted file mode 100644 index 78dc306f..0000000 --- a/chrome/app/theme/app_top_left.png +++ /dev/null diff --git a/chrome/app/theme/app_top_right.png b/chrome/app/theme/app_top_right.png Binary files differdeleted file mode 100644 index df3b9a3..0000000 --- a/chrome/app/theme/app_top_right.png +++ /dev/null diff --git a/chrome/app/theme/close.png b/chrome/app/theme/close.png Binary files differdeleted file mode 100644 index 6217569..0000000 --- a/chrome/app/theme/close.png +++ /dev/null diff --git a/chrome/app/theme/close_h.png b/chrome/app/theme/close_h.png Binary files differdeleted file mode 100644 index 9921435..0000000 --- a/chrome/app/theme/close_h.png +++ /dev/null diff --git a/chrome/app/theme/close_p.png b/chrome/app/theme/close_p.png Binary files differdeleted file mode 100644 index 0487e4a..0000000 --- a/chrome/app/theme/close_p.png +++ /dev/null diff --git a/chrome/app/theme/close_sa.png b/chrome/app/theme/close_sa.png Binary files differdeleted file mode 100644 index 12ae813..0000000 --- a/chrome/app/theme/close_sa.png +++ /dev/null diff --git a/chrome/app/theme/close_sa_h.png b/chrome/app/theme/close_sa_h.png Binary files differdeleted file mode 100644 index d5a7a42..0000000 --- a/chrome/app/theme/close_sa_h.png +++ /dev/null diff --git a/chrome/app/theme/close_sa_p.png b/chrome/app/theme/close_sa_p.png Binary files differdeleted file mode 100644 index c1d7c91..0000000 --- a/chrome/app/theme/close_sa_p.png +++ /dev/null diff --git a/chrome/app/theme/content_bottom_center.png b/chrome/app/theme/content_bottom_center.png Binary files differdeleted file mode 100644 index efce9cf..0000000 --- a/chrome/app/theme/content_bottom_center.png +++ /dev/null diff --git a/chrome/app/theme/content_bottom_left_corner.png b/chrome/app/theme/content_bottom_left_corner.png Binary files differdeleted file mode 100644 index db7b04f..0000000 --- a/chrome/app/theme/content_bottom_left_corner.png +++ /dev/null diff --git a/chrome/app/theme/content_bottom_right_corner.png b/chrome/app/theme/content_bottom_right_corner.png Binary files differdeleted file mode 100644 index d4c0136..0000000 --- a/chrome/app/theme/content_bottom_right_corner.png +++ /dev/null diff --git a/chrome/app/theme/content_left_side.png b/chrome/app/theme/content_left_side.png Binary files differdeleted file mode 100644 index 93bc64b..0000000 --- a/chrome/app/theme/content_left_side.png +++ /dev/null diff --git a/chrome/app/theme/content_right_side.png b/chrome/app/theme/content_right_side.png Binary files differdeleted file mode 100644 index 598858b..0000000 --- a/chrome/app/theme/content_right_side.png +++ /dev/null diff --git a/chrome/app/theme/default_favicon.png b/chrome/app/theme/default_favicon.png Binary files differdeleted file mode 100644 index a0aec4a..0000000 --- a/chrome/app/theme/default_favicon.png +++ /dev/null diff --git a/chrome/app/theme/folder_closed.png b/chrome/app/theme/folder_closed.png Binary files differdeleted file mode 100644 index 746fab9..0000000 --- a/chrome/app/theme/folder_closed.png +++ /dev/null diff --git a/chrome/app/theme/folder_closed_rtl.png b/chrome/app/theme/folder_closed_rtl.png Binary files differdeleted file mode 100644 index dbd0b0a..0000000 --- a/chrome/app/theme/folder_closed_rtl.png +++ /dev/null diff --git a/chrome/app/theme/folder_open.png b/chrome/app/theme/folder_open.png Binary files differdeleted file mode 100644 index 3276810..0000000 --- a/chrome/app/theme/folder_open.png +++ /dev/null diff --git a/chrome/app/theme/folder_open_rtl.png b/chrome/app/theme/folder_open_rtl.png Binary files differdeleted file mode 100644 index 9ba7069..0000000 --- a/chrome/app/theme/folder_open_rtl.png +++ /dev/null diff --git a/chrome/app/theme/input_alert.png b/chrome/app/theme/input_alert.png Binary files differdeleted file mode 100644 index 503a545..0000000 --- a/chrome/app/theme/input_alert.png +++ /dev/null diff --git a/chrome/app/theme/input_good.png b/chrome/app/theme/input_good.png Binary files differdeleted file mode 100644 index 1646cd5..0000000 --- a/chrome/app/theme/input_good.png +++ /dev/null diff --git a/chrome/app/theme/input_unknown.png b/chrome/app/theme/input_unknown.png Binary files differdeleted file mode 100644 index 0a5484d..0000000 --- a/chrome/app/theme/input_unknown.png +++ /dev/null diff --git a/chrome/app/theme/maximize.png b/chrome/app/theme/maximize.png Binary files differdeleted file mode 100644 index 5fb89e2..0000000 --- a/chrome/app/theme/maximize.png +++ /dev/null diff --git a/chrome/app/theme/maximize_h.png b/chrome/app/theme/maximize_h.png Binary files differdeleted file mode 100644 index ab326b1..0000000 --- a/chrome/app/theme/maximize_h.png +++ /dev/null diff --git a/chrome/app/theme/maximize_p.png b/chrome/app/theme/maximize_p.png Binary files differdeleted file mode 100644 index 6c92c75..0000000 --- a/chrome/app/theme/maximize_p.png +++ /dev/null diff --git a/chrome/app/theme/menu_droparrow.png b/chrome/app/theme/menu_droparrow.png Binary files differdeleted file mode 100644 index 8aef68b..0000000 --- a/chrome/app/theme/menu_droparrow.png +++ /dev/null diff --git a/chrome/app/theme/minimize.png b/chrome/app/theme/minimize.png Binary files differdeleted file mode 100644 index fe0ab2f..0000000 --- a/chrome/app/theme/minimize.png +++ /dev/null diff --git a/chrome/app/theme/minimize_h.png b/chrome/app/theme/minimize_h.png Binary files differdeleted file mode 100644 index 6bceb24..0000000 --- a/chrome/app/theme/minimize_h.png +++ /dev/null diff --git a/chrome/app/theme/minimize_p.png b/chrome/app/theme/minimize_p.png Binary files differdeleted file mode 100644 index 62b2f77..0000000 --- a/chrome/app/theme/minimize_p.png +++ /dev/null diff --git a/chrome/app/theme/restore.png b/chrome/app/theme/restore.png Binary files differdeleted file mode 100644 index bb70f2d..0000000 --- a/chrome/app/theme/restore.png +++ /dev/null diff --git a/chrome/app/theme/restore_h.png b/chrome/app/theme/restore_h.png Binary files differdeleted file mode 100644 index 96851ef..0000000 --- a/chrome/app/theme/restore_h.png +++ /dev/null diff --git a/chrome/app/theme/restore_p.png b/chrome/app/theme/restore_p.png Binary files differdeleted file mode 100644 index 96851ef..0000000 --- a/chrome/app/theme/restore_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_b_h.png b/chrome/app/theme/textbutton_b_h.png Binary files differdeleted file mode 100644 index 169db96..0000000 --- a/chrome/app/theme/textbutton_b_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_b_p.png b/chrome/app/theme/textbutton_b_p.png Binary files differdeleted file mode 100644 index f1fb512..0000000 --- a/chrome/app/theme/textbutton_b_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_bl_h.png b/chrome/app/theme/textbutton_bl_h.png Binary files differdeleted file mode 100644 index f45f0e8..0000000 --- a/chrome/app/theme/textbutton_bl_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_bl_p.png b/chrome/app/theme/textbutton_bl_p.png Binary files differdeleted file mode 100644 index 06712be..0000000 --- a/chrome/app/theme/textbutton_bl_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_br_h.png b/chrome/app/theme/textbutton_br_h.png Binary files differdeleted file mode 100644 index e8f3b1f..0000000 --- a/chrome/app/theme/textbutton_br_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_br_p.png b/chrome/app/theme/textbutton_br_p.png Binary files differdeleted file mode 100644 index a84c385..0000000 --- a/chrome/app/theme/textbutton_br_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_c_h.png b/chrome/app/theme/textbutton_c_h.png Binary files differdeleted file mode 100644 index 6188590..0000000 --- a/chrome/app/theme/textbutton_c_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_c_p.png b/chrome/app/theme/textbutton_c_p.png Binary files differdeleted file mode 100644 index 2925888..0000000 --- a/chrome/app/theme/textbutton_c_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_l_h.png b/chrome/app/theme/textbutton_l_h.png Binary files differdeleted file mode 100644 index 4e3b7ab..0000000 --- a/chrome/app/theme/textbutton_l_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_l_p.png b/chrome/app/theme/textbutton_l_p.png Binary files differdeleted file mode 100644 index 8641049..0000000 --- a/chrome/app/theme/textbutton_l_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_r_h.png b/chrome/app/theme/textbutton_r_h.png Binary files differdeleted file mode 100644 index 946c5ef..0000000 --- a/chrome/app/theme/textbutton_r_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_r_p.png b/chrome/app/theme/textbutton_r_p.png Binary files differdeleted file mode 100644 index e4f7f34..0000000 --- a/chrome/app/theme/textbutton_r_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_t_h.png b/chrome/app/theme/textbutton_t_h.png Binary files differdeleted file mode 100644 index 11285e0..0000000 --- a/chrome/app/theme/textbutton_t_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_t_p.png b/chrome/app/theme/textbutton_t_p.png Binary files differdeleted file mode 100644 index c212b4f..0000000 --- a/chrome/app/theme/textbutton_t_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_tl_h.png b/chrome/app/theme/textbutton_tl_h.png Binary files differdeleted file mode 100644 index 51208bc..0000000 --- a/chrome/app/theme/textbutton_tl_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_tl_p.png b/chrome/app/theme/textbutton_tl_p.png Binary files differdeleted file mode 100644 index 6422023..0000000 --- a/chrome/app/theme/textbutton_tl_p.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_tr_h.png b/chrome/app/theme/textbutton_tr_h.png Binary files differdeleted file mode 100644 index f07e92ff..0000000 --- a/chrome/app/theme/textbutton_tr_h.png +++ /dev/null diff --git a/chrome/app/theme/textbutton_tr_p.png b/chrome/app/theme/textbutton_tr_p.png Binary files differdeleted file mode 100644 index ab87ec6..0000000 --- a/chrome/app/theme/textbutton_tr_p.png +++ /dev/null diff --git a/chrome/app/theme/theme_dll.vcproj b/chrome/app/theme/theme_dll.vcproj index 1ec5d14..a1c0c66 100644 --- a/chrome/app/theme/theme_dll.vcproj +++ b/chrome/app/theme/theme_dll.vcproj @@ -143,6 +143,10 @@ RelativePath="$(OutDir)\grit_derived_sources\theme_resources.rc" > </File> + <File + RelativePath="$(IntDir)\..\global_intermediate\app\app_resources.rc" + > + </File> </Files> <Globals> </Globals> diff --git a/chrome/app/theme/theme_frame_default.png b/chrome/app/theme/theme_frame_default.png Binary files differdeleted file mode 100644 index 3f4f7e9..0000000 --- a/chrome/app/theme/theme_frame_default.png +++ /dev/null diff --git a/chrome/app/theme/theme_frame_default_inactive.png b/chrome/app/theme/theme_frame_default_inactive.png Binary files differdeleted file mode 100644 index a1eff41..0000000 --- a/chrome/app/theme/theme_frame_default_inactive.png +++ /dev/null diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 58949ea..125ffff 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -17,26 +17,15 @@ <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" /> <include name="IDR_BOOKMARK_BAR_RECENTLY_BOOKMARKED_ICON" file="star_small.png" type="BINDATA" /> <include name="IDR_BOOKMARK_BAR_CHEVRONS" file="chevron.png" type="BINDATA" /> - <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_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_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" /> <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type="BINDATA" /> <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" type="BINDATA" /> <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" type="BINDATA" /> - <include name="IDR_DEFAULT_FAVICON" file="default_favicon.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_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" /> - <include name="IDR_FOLDER_OPEN" file="folder_open.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" /> @@ -49,12 +38,6 @@ <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" 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" /> <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" /> @@ -75,18 +58,6 @@ <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_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_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_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" /> @@ -134,9 +105,6 @@ <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_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_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" /> <include name="IDR_LOCK" file="lock_small.png" type="BINDATA" /> <include name="IDR_WARNING" file="alert_small.png" type="BINDATA" /> @@ -189,24 +157,6 @@ <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_ARROW_RIGHT" file="arrow_right.png" type="BINDATA" /> - <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" /> <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" /> @@ -244,9 +194,6 @@ <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_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_HISTORY_SECTION" file="history_section.png" type="BINDATA" /> <include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="BINDATA" /> <include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="BINDATA" /> @@ -260,21 +207,16 @@ <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_INPUT_GOOD" file="input_good.png" type="BINDATA" /> - <include name="IDR_INPUT_ALERT" file="input_alert.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" /> - <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_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" type="BINDATA" /> <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_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_MENU_DROPARROW" file="menu_droparrow.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_DOCK_MAX" file="dock_tab_max.png" type="BINDATA" /> @@ -306,8 +248,6 @@ <include name="IDR_O2_STAR_SELECTED_DARK" file="o2_star_selected_dark.png" type="BINDATA" /> <include name="IDR_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" /> - <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" /> <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" /> diff --git a/chrome/app/theme/throbber.png b/chrome/app/theme/throbber.png Binary files differdeleted file mode 100644 index 6ca1fdd..0000000 --- a/chrome/app/theme/throbber.png +++ /dev/null diff --git a/chrome/app/theme/window_bottom_center.png b/chrome/app/theme/window_bottom_center.png Binary files differdeleted file mode 100644 index 3fb76f1..0000000 --- a/chrome/app/theme/window_bottom_center.png +++ /dev/null diff --git a/chrome/app/theme/window_bottom_left_corner.png b/chrome/app/theme/window_bottom_left_corner.png Binary files differdeleted file mode 100644 index 1d3c066..0000000 --- a/chrome/app/theme/window_bottom_left_corner.png +++ /dev/null diff --git a/chrome/app/theme/window_bottom_right_corner.png b/chrome/app/theme/window_bottom_right_corner.png Binary files differdeleted file mode 100644 index 83cf5b9..0000000 --- a/chrome/app/theme/window_bottom_right_corner.png +++ /dev/null diff --git a/chrome/app/theme/window_left_side.png b/chrome/app/theme/window_left_side.png Binary files differdeleted file mode 100644 index 2553d1b..0000000 --- a/chrome/app/theme/window_left_side.png +++ /dev/null diff --git a/chrome/app/theme/window_right_side.png b/chrome/app/theme/window_right_side.png Binary files differdeleted file mode 100644 index c89b47b..0000000 --- a/chrome/app/theme/window_right_side.png +++ /dev/null diff --git a/chrome/app/theme/window_top_center.png b/chrome/app/theme/window_top_center.png Binary files differdeleted file mode 100644 index e2c393e..0000000 --- a/chrome/app/theme/window_top_center.png +++ /dev/null diff --git a/chrome/app/theme/window_top_left_corner.png b/chrome/app/theme/window_top_left_corner.png Binary files differdeleted file mode 100644 index 4bb52ce..0000000 --- a/chrome/app/theme/window_top_left_corner.png +++ /dev/null diff --git a/chrome/app/theme/window_top_right_corner.png b/chrome/app/theme/window_top_right_corner.png Binary files differdeleted file mode 100644 index d1da9ca..0000000 --- a/chrome/app/theme/window_top_right_corner.png +++ /dev/null diff --git a/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc index fbba86d..33ff46e 100644 --- a/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc @@ -15,6 +15,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/common/gtk_util.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/bookmarks/bookmark_menu_controller_win.cc b/chrome/browser/bookmarks/bookmark_menu_controller_win.cc index 2a19770..9788358 100644 --- a/chrome/browser/bookmarks/bookmark_menu_controller_win.cc +++ b/chrome/browser/bookmarks/bookmark_menu_controller_win.cc @@ -14,6 +14,7 @@ #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/views/event_utils.h" #include "chrome/common/page_transition_types.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc index 62008fb..458ad0c 100644 --- a/chrome/browser/bookmarks/bookmark_table_model.cc +++ b/chrome/browser/bookmarks/bookmark_table_model.cc @@ -12,6 +12,7 @@ #include "base/time_format.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "googleurl/src/gurl.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index be4cd94..5b82fd8 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -43,6 +43,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app" /> <Tool Name="VCManagedResourceCompilerTool" @@ -97,6 +98,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app" /> <Tool Name="VCManagedResourceCompilerTool" @@ -754,15 +756,15 @@ > </File> <File - RelativePath=".\dock_info_win.cc" + RelativePath=".\dock_info.cc" > </File> <File - RelativePath=".\dock_info.cc" + RelativePath=".\dock_info.h" > </File> <File - RelativePath=".\dock_info.h" + RelativePath=".\dock_info_win.cc" > </File> <File diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc index eaf6040..6c80bbc 100644 --- a/chrome/browser/browser_theme_provider.cc +++ b/chrome/browser/browser_theme_provider.cc @@ -14,6 +14,7 @@ #include "chrome/browser/theme_resources_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/app_resources.h" #include "grit/theme_resources.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc index 233bd83..bb7b9f0 100644 --- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc +++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc @@ -7,7 +7,7 @@ #include "app/resource_bundle.h" #include "chrome/browser/profile.h" #include "chrome/common/url_constants.h" -#include "grit/theme_resources.h" +#include "grit/app_resources.h" DOMUIFavIconSource::DOMUIFavIconSource(Profile* profile) : DataSource(chrome::kChromeUIFavIconPath, MessageLoop::current()), diff --git a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc index b62231c..2675049 100644 --- a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc +++ b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc @@ -54,11 +54,12 @@ TEST_F(DOMUISourcesTest, ThemeSourceMimeTypes) { TEST_F(DOMUISourcesTest, ThemeSourceImages) { // Our test data. Rather than comparing the data itself, we just compare // its size. - SkBitmap* image = ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_THEME_FRAME); + SkBitmap* image = ResourceBundle::GetSharedInstance().GetBitmapNamed( + IDR_THEME_FRAME_INCOGNITO); std::vector<unsigned char> png_bytes; PNGEncoder::EncodeBGRASkBitmap(*image, false, &png_bytes); - theme_source()->StartDataRequest("theme_frame", 1); + theme_source()->StartDataRequest("theme_frame_incognito", 1); EXPECT_EQ(theme_source()->result_request_id_, 1); EXPECT_EQ(theme_source()->result_data_size_, png_bytes.size()); diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 301a8d5..24f2265 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -24,6 +24,7 @@ #include "chrome/common/gtk_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/gtk_chrome_button.cc b/chrome/browser/gtk/gtk_chrome_button.cc index ceddef2..9d344b9 100644 --- a/chrome/browser/gtk/gtk_chrome_button.cc +++ b/chrome/browser/gtk/gtk_chrome_button.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/browser/gtk/nine_box.h" -#include "grit/theme_resources.h" +#include "grit/app_resources.h" namespace { diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index b222002..c2a3be6 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc @@ -11,6 +11,7 @@ #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 0f65c07..ec69db4 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -15,6 +15,7 @@ #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc index a21088f..2a30087 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -20,6 +20,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" +#include "grit/app_resources.h" #include "webkit/glue/webkit_glue.h" #if defined(OS_WIN) diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc index 2b6e20f..655a998 100644 --- a/chrome/browser/tab_contents/navigation_entry.cc +++ b/chrome/browser/tab_contents/navigation_entry.cc @@ -10,6 +10,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" +#include "grit/app_resources.h" // Use this to get a new unique ID for a NavigationEntry during construction. // The returned ID is guaranteed to be nonzero (which is the "no ID" indicator). diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index 7a7a252..717ffd6 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -18,9 +18,9 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "grit/theme_resources.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index f295476..fdf641f 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -33,6 +33,7 @@ #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj index 0542cbe..e76d85f 100644 --- a/chrome/browser/views/browser_views.vcproj +++ b/chrome/browser/views/browser_views.vcproj @@ -37,6 +37,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app" /> <Tool Name="VCManagedResourceCompilerTool" @@ -88,6 +89,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app" /> <Tool Name="VCManagedResourceCompilerTool" @@ -329,15 +331,15 @@ > </File> <File - RelativePath=".\tabs\native_view_photobooth_win.cc" + RelativePath=".\tabs\native_view_photobooth.h" > </File> <File - RelativePath=".\tabs\native_view_photobooth_win.h" + RelativePath=".\tabs\native_view_photobooth_win.cc" > </File> <File - RelativePath=".\tabs\native_view_photobooth.h" + RelativePath=".\tabs\native_view_photobooth_win.h" > </File> <File diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index 7b531c6..596321e 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -25,6 +25,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 78434e5..c2142c5 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -14,6 +14,7 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/keyword_editor_view.h" #include "googleurl/src/gurl.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index d34e151..0f850c1 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -56,6 +56,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index bfbc584..16dbc13 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -10,6 +10,7 @@ #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" +#include "grit/app_resources.h" #include "grit/theme_resources.h" #include "views/window/client_view.h" #include "views/window/window_resources.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 626e700..27727cf 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -15,6 +15,7 @@ #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" +#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index 8f67db9..cf5a3d8 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -20,6 +20,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 77dd376..0966b8d 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -23,8 +23,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" -#include "grit/theme_resources.h" #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/button/radio_button.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 35af571..64e6cb0 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -28,9 +28,9 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" +#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index 80c5776..f5ccb2d 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -15,9 +15,9 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "grit/theme_resources.h" #include "net/base/net_util.h" #include "views/background.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 315d310..3349bb4 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -15,6 +15,7 @@ #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "grit/app_resources.h" #include "grit/theme_resources.h" static bool g_initialized = false; diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 20df3bb..659e5a8 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -15,6 +15,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 273f871..1e60981 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -458,6 +458,7 @@ 'chrome_resources', 'chrome_strings', 'theme_resources', + '../app/app.gyp:app_resources', '../media/media.gyp:media', '../net/net.gyp:net_resources', '../skia/skia.gyp:skia', @@ -2169,6 +2170,7 @@ 'action_name': 'repack_theme', 'variables': { 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.pak', ], }, @@ -2706,6 +2708,7 @@ 'chrome_resources', 'chrome_strings', 'test_support_unit', + '../app/app.gyp:app_resources', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', '../webkit/webkit.gyp:webkit', diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 838b11d..a0d0d94 100644 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -7,6 +7,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser\browser.vcproj", "{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}" ProjectSection(ProjectDependencies) = postProject {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} = {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} {4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35} {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} @@ -30,6 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc_tests", "common\ipc_tes EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcproj", "{899F1280-3441-4D1F-BA04-CCD6208D9146}" ProjectSection(ProjectDependencies) = postProject + {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} = {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection @@ -286,6 +288,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "test\unit\uni {238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601} {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} + {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} = {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} {4631946D-7D5F-44BD-A5A8-504C0A7033BE} = {4631946D-7D5F-44BD-A5A8-504C0A7033BE} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} {57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6} @@ -1269,6 +1272,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\testing\gtest.v EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debugger", "browser\debugger\debugger.vcproj", "{57823D8C-A317-4713-9125-2C91FDFD12D6}" ProjectSection(ProjectDependencies) = postProject + {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} = {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection @@ -1309,6 +1313,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\views\browser_views.vcproj", "{FA537565-7B03-4FFC-AF15-F7A979B72E22}" ProjectSection(ProjectDependencies) = postProject {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} = {3FBC4235-3FBD-46DF-AEDC-BADBBA13A095} {4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35} {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 600d545..241df4c 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -42,6 +42,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app" /> <Tool Name="VCManagedResourceCompilerTool" @@ -108,6 +109,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app" /> <Tool Name="VCManagedResourceCompilerTool" |
