Revert 16567.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16575 0039d316-1c4b-4281-b951-d872f2087c98

101 files changed, 96 insertions, 125 deletions

diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd
index 2f9f577..1525701 100644
--- a/app/resources/app_resources.grd
+++ b/app/resources/app_resources.grd
@@ -10,84 +10,6 @@
   <release seq="1">
     <includes>
 
-      <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" />
-
-      <!-- Window Controls -->
-      <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" />
-
-      <!-- Frame Theme Images -->
-      <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" />
-
-      <!-- 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" />
-
-      <!-- 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_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" />
-
-      <!-- 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" />
     </includes>
   </release>
 </grit>
diff --git a/app/resources/app_top_center.png b/chrome/app/theme/app_top_center.png
index 46f8f96..46f8f96 100644
--- a/app/resources/app_top_center.png
+++ b/chrome/app/theme/app_top_center.png
diff --git a/app/resources/app_top_left.png b/chrome/app/theme/app_top_left.png
index 78dc306f..78dc306f 100644
--- a/app/resources/app_top_left.png
+++ b/chrome/app/theme/app_top_left.png
diff --git a/app/resources/app_top_right.png b/chrome/app/theme/app_top_right.png
index df3b9a3..df3b9a3 100644
--- a/app/resources/app_top_right.png
+++ b/chrome/app/theme/app_top_right.png
diff --git a/app/resources/close.png b/chrome/app/theme/close.png
index 6217569..6217569 100644
--- a/app/resources/close.png
+++ b/chrome/app/theme/close.png
diff --git a/app/resources/close_h.png b/chrome/app/theme/close_h.png
index 9921435..9921435 100644
--- a/app/resources/close_h.png
+++ b/chrome/app/theme/close_h.png
diff --git a/app/resources/close_p.png b/chrome/app/theme/close_p.png
index 0487e4a..0487e4a 100644
--- a/app/resources/close_p.png
+++ b/chrome/app/theme/close_p.png
diff --git a/app/resources/close_sa.png b/chrome/app/theme/close_sa.png
index 12ae813..12ae813 100644
--- a/app/resources/close_sa.png
+++ b/chrome/app/theme/close_sa.png
diff --git a/app/resources/close_sa_h.png b/chrome/app/theme/close_sa_h.png
index d5a7a42..d5a7a42 100644
--- a/app/resources/close_sa_h.png
+++ b/chrome/app/theme/close_sa_h.png
diff --git a/app/resources/close_sa_p.png b/chrome/app/theme/close_sa_p.png
index c1d7c91..c1d7c91 100644
--- a/app/resources/close_sa_p.png
+++ b/chrome/app/theme/close_sa_p.png
diff --git a/app/resources/content_bottom_center.png b/chrome/app/theme/content_bottom_center.png
index efce9cf..efce9cf 100644
--- a/app/resources/content_bottom_center.png
+++ b/chrome/app/theme/content_bottom_center.png
diff --git a/app/resources/content_bottom_left_corner.png b/chrome/app/theme/content_bottom_left_corner.png
index db7b04f..db7b04f 100644
--- a/app/resources/content_bottom_left_corner.png
+++ b/chrome/app/theme/content_bottom_left_corner.png
diff --git a/app/resources/content_bottom_right_corner.png b/chrome/app/theme/content_bottom_right_corner.png
index d4c0136..d4c0136 100644
--- a/app/resources/content_bottom_right_corner.png
+++ b/chrome/app/theme/content_bottom_right_corner.png
diff --git a/app/resources/content_left_side.png b/chrome/app/theme/content_left_side.png
index 93bc64b..93bc64b 100644
--- a/app/resources/content_left_side.png
+++ b/chrome/app/theme/content_left_side.png
diff --git a/app/resources/content_right_side.png b/chrome/app/theme/content_right_side.png
index 598858b..598858b 100644
--- a/app/resources/content_right_side.png
+++ b/chrome/app/theme/content_right_side.png
diff --git a/app/resources/default_favicon.png b/chrome/app/theme/default_favicon.png
index a0aec4a..a0aec4a 100644
--- a/app/resources/default_favicon.png
+++ b/chrome/app/theme/default_favicon.png
diff --git a/app/resources/folder_closed.png b/chrome/app/theme/folder_closed.png
index 746fab9..746fab9 100644
--- a/app/resources/folder_closed.png
+++ b/chrome/app/theme/folder_closed.png
diff --git a/app/resources/folder_closed_rtl.png b/chrome/app/theme/folder_closed_rtl.png
index dbd0b0a..dbd0b0a 100644
--- a/app/resources/folder_closed_rtl.png
+++ b/chrome/app/theme/folder_closed_rtl.png
diff --git a/app/resources/folder_open.png b/chrome/app/theme/folder_open.png
index 3276810..3276810 100644
--- a/app/resources/folder_open.png
+++ b/chrome/app/theme/folder_open.png
diff --git a/app/resources/folder_open_rtl.png b/chrome/app/theme/folder_open_rtl.png
index 9ba7069..9ba7069 100644
--- a/app/resources/folder_open_rtl.png
+++ b/chrome/app/theme/folder_open_rtl.png
diff --git a/app/resources/input_alert.png b/chrome/app/theme/input_alert.png
index 503a545..503a545 100644
--- a/app/resources/input_alert.png
+++ b/chrome/app/theme/input_alert.png
diff --git a/app/resources/input_good.png b/chrome/app/theme/input_good.png
index 1646cd5..1646cd5 100644
--- a/app/resources/input_good.png
+++ b/chrome/app/theme/input_good.png
diff --git a/app/resources/input_unknown.png b/chrome/app/theme/input_unknown.png
index 0a5484d..0a5484d 100644
--- a/app/resources/input_unknown.png
+++ b/chrome/app/theme/input_unknown.png
diff --git a/app/resources/maximize.png b/chrome/app/theme/maximize.png
index 5fb89e2..5fb89e2 100644
--- a/app/resources/maximize.png
+++ b/chrome/app/theme/maximize.png
diff --git a/app/resources/maximize_h.png b/chrome/app/theme/maximize_h.png
index ab326b1..ab326b1 100644
--- a/app/resources/maximize_h.png
+++ b/chrome/app/theme/maximize_h.png
diff --git a/app/resources/maximize_p.png b/chrome/app/theme/maximize_p.png
index 6c92c75..6c92c75 100644
--- a/app/resources/maximize_p.png
+++ b/chrome/app/theme/maximize_p.png
diff --git a/app/resources/menu_droparrow.png b/chrome/app/theme/menu_droparrow.png
index 8aef68b..8aef68b 100644
--- a/app/resources/menu_droparrow.png
+++ b/chrome/app/theme/menu_droparrow.png
diff --git a/app/resources/minimize.png b/chrome/app/theme/minimize.png
index fe0ab2f..fe0ab2f 100644
--- a/app/resources/minimize.png
+++ b/chrome/app/theme/minimize.png
diff --git a/app/resources/minimize_h.png b/chrome/app/theme/minimize_h.png
index 6bceb24..6bceb24 100644
--- a/app/resources/minimize_h.png
+++ b/chrome/app/theme/minimize_h.png
diff --git a/app/resources/minimize_p.png b/chrome/app/theme/minimize_p.png
index 62b2f77..62b2f77 100644
--- a/app/resources/minimize_p.png
+++ b/chrome/app/theme/minimize_p.png
diff --git a/app/resources/restore.png b/chrome/app/theme/restore.png
index bb70f2d..bb70f2d 100644
--- a/app/resources/restore.png
+++ b/chrome/app/theme/restore.png
diff --git a/app/resources/restore_h.png b/chrome/app/theme/restore_h.png
index 96851ef..96851ef 100644
--- a/app/resources/restore_h.png
+++ b/chrome/app/theme/restore_h.png
diff --git a/app/resources/restore_p.png b/chrome/app/theme/restore_p.png
index 96851ef..96851ef 100644
--- a/app/resources/restore_p.png
+++ b/chrome/app/theme/restore_p.png
diff --git a/app/resources/textbutton_b_h.png b/chrome/app/theme/textbutton_b_h.png
index 169db96..169db96 100644
--- a/app/resources/textbutton_b_h.png
+++ b/chrome/app/theme/textbutton_b_h.png
diff --git a/app/resources/textbutton_b_p.png b/chrome/app/theme/textbutton_b_p.png
index f1fb512..f1fb512 100644
--- a/app/resources/textbutton_b_p.png
+++ b/chrome/app/theme/textbutton_b_p.png
diff --git a/app/resources/textbutton_bl_h.png b/chrome/app/theme/textbutton_bl_h.png
index f45f0e8..f45f0e8 100644
--- a/app/resources/textbutton_bl_h.png
+++ b/chrome/app/theme/textbutton_bl_h.png
diff --git a/app/resources/textbutton_bl_p.png b/chrome/app/theme/textbutton_bl_p.png
index 06712be..06712be 100644
--- a/app/resources/textbutton_bl_p.png
+++ b/chrome/app/theme/textbutton_bl_p.png
diff --git a/app/resources/textbutton_br_h.png b/chrome/app/theme/textbutton_br_h.png
index e8f3b1f..e8f3b1f 100644
--- a/app/resources/textbutton_br_h.png
+++ b/chrome/app/theme/textbutton_br_h.png
diff --git a/app/resources/textbutton_br_p.png b/chrome/app/theme/textbutton_br_p.png
index a84c385..a84c385 100644
--- a/app/resources/textbutton_br_p.png
+++ b/chrome/app/theme/textbutton_br_p.png
diff --git a/app/resources/textbutton_c_h.png b/chrome/app/theme/textbutton_c_h.png
index 6188590..6188590 100644
--- a/app/resources/textbutton_c_h.png
+++ b/chrome/app/theme/textbutton_c_h.png
diff --git a/app/resources/textbutton_c_p.png b/chrome/app/theme/textbutton_c_p.png
index 2925888..2925888 100644
--- a/app/resources/textbutton_c_p.png
+++ b/chrome/app/theme/textbutton_c_p.png
diff --git a/app/resources/textbutton_l_h.png b/chrome/app/theme/textbutton_l_h.png
index 4e3b7ab..4e3b7ab 100644
--- a/app/resources/textbutton_l_h.png
+++ b/chrome/app/theme/textbutton_l_h.png
diff --git a/app/resources/textbutton_l_p.png b/chrome/app/theme/textbutton_l_p.png
index 8641049..8641049 100644
--- a/app/resources/textbutton_l_p.png
+++ b/chrome/app/theme/textbutton_l_p.png
diff --git a/app/resources/textbutton_r_h.png b/chrome/app/theme/textbutton_r_h.png
index 946c5ef..946c5ef 100644
--- a/app/resources/textbutton_r_h.png
+++ b/chrome/app/theme/textbutton_r_h.png
diff --git a/app/resources/textbutton_r_p.png b/chrome/app/theme/textbutton_r_p.png
index e4f7f34..e4f7f34 100644
--- a/app/resources/textbutton_r_p.png
+++ b/chrome/app/theme/textbutton_r_p.png
diff --git a/app/resources/textbutton_t_h.png b/chrome/app/theme/textbutton_t_h.png
index 11285e0..11285e0 100644
--- a/app/resources/textbutton_t_h.png
+++ b/chrome/app/theme/textbutton_t_h.png
diff --git a/app/resources/textbutton_t_p.png b/chrome/app/theme/textbutton_t_p.png
index c212b4f..c212b4f 100644
--- a/app/resources/textbutton_t_p.png
+++ b/chrome/app/theme/textbutton_t_p.png
diff --git a/app/resources/textbutton_tl_h.png b/chrome/app/theme/textbutton_tl_h.png
index 51208bc..51208bc 100644
--- a/app/resources/textbutton_tl_h.png
+++ b/chrome/app/theme/textbutton_tl_h.png
diff --git a/app/resources/textbutton_tl_p.png b/chrome/app/theme/textbutton_tl_p.png
index 6422023..6422023 100644
--- a/app/resources/textbutton_tl_p.png
+++ b/chrome/app/theme/textbutton_tl_p.png
diff --git a/app/resources/textbutton_tr_h.png b/chrome/app/theme/textbutton_tr_h.png
index f07e92ff..f07e92ff 100644
--- a/app/resources/textbutton_tr_h.png
+++ b/chrome/app/theme/textbutton_tr_h.png
diff --git a/app/resources/textbutton_tr_p.png b/chrome/app/theme/textbutton_tr_p.png
index ab87ec6..ab87ec6 100644
--- a/app/resources/textbutton_tr_p.png
+++ b/chrome/app/theme/textbutton_tr_p.png
diff --git a/app/resources/theme_frame_default.png b/chrome/app/theme/theme_frame_default.png
index 3f4f7e9..3f4f7e9 100644
--- a/app/resources/theme_frame_default.png
+++ b/chrome/app/theme/theme_frame_default.png
diff --git a/app/resources/theme_frame_default_inactive.png b/chrome/app/theme/theme_frame_default_inactive.png
index a1eff41..a1eff41 100644
--- a/app/resources/theme_frame_default_inactive.png
+++ b/chrome/app/theme/theme_frame_default_inactive.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 91eca51..b0080d5 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -17,15 +17,26 @@
       <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" />
@@ -38,6 +49,12 @@
       <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" />
@@ -58,6 +75,18 @@
       <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" />
@@ -105,6 +134,9 @@
       <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" />
@@ -149,6 +181,24 @@
       <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" />
@@ -186,6 +236,9 @@
       <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" />
@@ -199,11 +252,15 @@
       <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_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" />
@@ -212,6 +269,7 @@
       <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" />
@@ -243,6 +301,8 @@
       <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/app/resources/throbber.png b/chrome/app/theme/throbber.png
index 6ca1fdd..6ca1fdd 100644
--- a/app/resources/throbber.png
+++ b/chrome/app/theme/throbber.png
diff --git a/app/resources/window_bottom_center.png b/chrome/app/theme/window_bottom_center.png
index 3fb76f1..3fb76f1 100644
--- a/app/resources/window_bottom_center.png
+++ b/chrome/app/theme/window_bottom_center.png
diff --git a/app/resources/window_bottom_left_corner.png b/chrome/app/theme/window_bottom_left_corner.png
index 1d3c066..1d3c066 100644
--- a/app/resources/window_bottom_left_corner.png
+++ b/chrome/app/theme/window_bottom_left_corner.png
diff --git a/app/resources/window_bottom_right_corner.png b/chrome/app/theme/window_bottom_right_corner.png
index 83cf5b9..83cf5b9 100644
--- a/app/resources/window_bottom_right_corner.png
+++ b/chrome/app/theme/window_bottom_right_corner.png
diff --git a/app/resources/window_left_side.png b/chrome/app/theme/window_left_side.png
index 2553d1b..2553d1b 100644
--- a/app/resources/window_left_side.png
+++ b/chrome/app/theme/window_left_side.png
diff --git a/app/resources/window_right_side.png b/chrome/app/theme/window_right_side.png
index c89b47b..c89b47b 100644
--- a/app/resources/window_right_side.png
+++ b/chrome/app/theme/window_right_side.png
diff --git a/app/resources/window_top_center.png b/chrome/app/theme/window_top_center.png
index e2c393e..e2c393e 100644
--- a/app/resources/window_top_center.png
+++ b/chrome/app/theme/window_top_center.png
diff --git a/app/resources/window_top_left_corner.png b/chrome/app/theme/window_top_left_corner.png
index 4bb52ce..4bb52ce 100644
--- a/app/resources/window_top_left_corner.png
+++ b/chrome/app/theme/window_top_left_corner.png
diff --git a/app/resources/window_top_right_corner.png b/chrome/app/theme/window_top_right_corner.png
index d1da9ca..d1da9ca 100644
--- a/app/resources/window_top_right_corner.png
+++ b/chrome/app/theme/window_top_right_corner.png
diff --git a/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
index 33ff46e..fbba86d 100644
--- a/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
@@ -15,7 +15,6 @@
 #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 9788358..2a19770 100644
--- a/chrome/browser/bookmarks/bookmark_menu_controller_win.cc
+++ b/chrome/browser/bookmarks/bookmark_menu_controller_win.cc
@@ -14,7 +14,6 @@
 #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 458ad0c..62008fb 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model.cc
@@ -12,7 +12,6 @@
 #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 877ce93..be4cd94 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -43,7 +43,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -755,15 +754,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\dock_info.cc"
+				RelativePath=".\dock_info_win.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dock_info.h"
+				RelativePath=".\dock_info.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dock_info_win.cc"
+				RelativePath=".\dock_info.h"
 				>
 			</File>
 			<File
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index 6c80bbc..eaf6040 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -14,7 +14,6 @@
 #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 bb7b9f0..233bd83 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/app_resources.h"
+#include "grit/theme_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 2dce8d2..b62231c 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
+++ b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // A mock ThemeSource (so we can override SendResponse to get at its data).
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 24f2265..301a8d5 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -24,7 +24,6 @@
 #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 691117f..93b0218 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/app_resources.h"
+#include "grit/theme_resources.h"
 
 namespace {
 
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index c2a3be6..b222002 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -11,7 +11,6 @@
 #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 511b0cc..6d9ae73 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -15,7 +15,6 @@
 #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 2a30087..a21088f 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -20,7 +20,6 @@
 #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 655a998..2b6e20f 100644
--- a/chrome/browser/tab_contents/navigation_entry.cc
+++ b/chrome/browser/tab_contents/navigation_entry.cc
@@ -10,7 +10,6 @@
 #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 1cb9c06..c4e186b 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 7a88299..a93387b 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -33,7 +33,6 @@
 #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 c87a3b0..0542cbe 100644
--- a/chrome/browser/views/browser_views.vcproj
+++ b/chrome/browser/views/browser_views.vcproj
@@ -37,7 +37,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -330,15 +329,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\tabs\native_view_photobooth.h"
+				RelativePath=".\tabs\native_view_photobooth_win.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\tabs\native_view_photobooth_win.cc"
+				RelativePath=".\tabs\native_view_photobooth_win.h"
 				>
 			</File>
 			<File
-				RelativePath=".\tabs\native_view_photobooth_win.h"
+				RelativePath=".\tabs\native_view_photobooth.h"
 				>
 			</File>
 			<File
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 596321e..7b531c6 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -25,7 +25,6 @@
 #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 4cacc40..2774379 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -14,7 +14,6 @@
 #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 824904d..000371c 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -57,7 +57,6 @@
 #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 16dbc13..bfbc584 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -10,7 +10,6 @@
 #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 27727cf..626e700 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -15,7 +15,6 @@
 #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 cf5a3d8..8f67db9 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -20,7 +20,6 @@
 #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 0966b8d..77dd376 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 2f0ea9c..7c54d5c 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 f5ccb2d..80c5776 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 3349bb4..315d310 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -15,7 +15,6 @@
 #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 659e5a8..20df3bb 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -15,7 +15,6 @@
 #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.sln b/chrome/chrome.sln
index a0d0d94..838b11d 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -7,7 +7,6 @@ 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}
@@ -31,7 +30,6 @@ 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
@@ -288,7 +286,6 @@ 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}
@@ -1272,7 +1269,6 @@ 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
@@ -1313,7 +1309,6 @@ 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 82467f9..600d545 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -42,7 +42,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(IntDir)\..\global_intermediate\app"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/views/DEPS b/views/DEPS
index fab173b..65bf36c 100644
--- a/views/DEPS
+++ b/views/DEPS
@@ -1,6 +1,7 @@
 include_rules = [
   "+app",
   "+grit/app_strings.h",
-  "+grit/app_resources.h",
+  # TODO(beng): swap these with app/views specific generated resources.
+  "+grit/theme_resources.h",
   "+skia/ext",
 ]
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index b7e1f8f..fdb28c0 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -10,7 +10,7 @@
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
 #include "grit/app_strings.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/event.h"
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index e468e9e..9bf9e24 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -10,7 +10,7 @@
 #include "app/resource_bundle.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 
 namespace views {
 
diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc
index ecc3033..680b623 100644
--- a/views/controls/scroll_view.cc
+++ b/views/controls/scroll_view.cc
@@ -6,6 +6,7 @@
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
+#include "grit/theme_resources.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/widget/root_view.h"
 
diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc
index 2a4e324..e15fcb3 100644
--- a/views/controls/throbber.cc
+++ b/views/controls/throbber.cc
@@ -7,7 +7,7 @@
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/time.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 4aebad7..ceaa461 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -15,7 +15,7 @@
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
diff --git a/views/drag_utils.cc b/views/drag_utils.cc
index 009fc47..17ba99b 100644
--- a/views/drag_utils.cc
+++ b/views/drag_utils.cc
@@ -18,7 +18,7 @@
 #include "base/gfx/point.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 #include "views/controls/button/text_button.h"
 
 namespace drag_utils {
diff --git a/views/views.gyp b/views/views.gyp
index dff1b66..d65a102 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -44,7 +44,6 @@
       'dependencies': [
         '../app/app.gyp:app_base',      
         '../app/app.gyp:app_strings',      
-        '../app/app.gyp:app_resources',      
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
@@ -261,6 +260,13 @@
             'window/native_frame_view.cc',
             'widget/widget_win.cc',
           ],
+          # TODO: Move these dependencies to platform-neutral once these
+          # projects are generated by GYP.
+          'dependencies': [
+            '../chrome/chrome.gyp:chrome_resources',
+            '../chrome/chrome.gyp:chrome_strings',
+            '../chrome/chrome.gyp:theme_resources',
+          ],
         }],
         ['OS=="win"', {
           'defines': [
@@ -272,6 +278,13 @@
             # TODO(beng): move wtl to src/third_party
             '../chrome/third_party/wtl/include',
           ],
+          # TODO: remove this when chrome_resources/chrome_strings are
+          #       generated by GYP.
+          # The legacy vcproj we rely on places the grit output in this
+          # directory, so we need to explicitly add it to our include path.
+          'include_dirs': [
+            '<(PRODUCT_DIR)/grit_derived_sources',
+          ],
         }],
       ],
     },
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index e8fdb0f..35ecb6b 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -13,7 +13,7 @@
 #include "app/win_util.h"
 #include "base/win_util.h"
 #endif
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"