This is the first pass at themes.

This CL is paired with http://codereview.chromium.org/67284

This CL (for commit purposes) includes http://codereview.chromium.org/67284

BUG=4463,11232,11233,11234,11235

Review URL: http://codereview.chromium.org/99030

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

91 files changed, 18 insertions, 41 deletions

diff --git a/chrome/app/theme/app_top_center.png b/chrome/app/theme/app_top_center.png
index 863ff19..46f8f96 100644
--- a/chrome/app/theme/app_top_center.png
+++ b/chrome/app/theme/app_top_center.png
diff --git a/chrome/app/theme/app_top_left.png b/chrome/app/theme/app_top_left.png
index 79723bc..78dc306f 100644
--- a/chrome/app/theme/app_top_left.png
+++ b/chrome/app/theme/app_top_left.png
diff --git a/chrome/app/theme/app_top_right.png b/chrome/app/theme/app_top_right.png
index b00c3ea..df3b9a3 100644
--- a/chrome/app/theme/app_top_right.png
+++ b/chrome/app/theme/app_top_right.png
diff --git a/chrome/app/theme/back.png b/chrome/app/theme/back.png
index 4f7a2d2..b983fca 100644
--- a/chrome/app/theme/back.png
+++ b/chrome/app/theme/back.png
diff --git a/chrome/app/theme/back_d.png b/chrome/app/theme/back_d.png
index b216b18..1b51a59 100644
--- a/chrome/app/theme/back_d.png
+++ b/chrome/app/theme/back_d.png
diff --git a/chrome/app/theme/constrained_bottom_center.png b/chrome/app/theme/constrained_bottom_center.png
deleted file mode 100644
index e1014b5..0000000
--- a/chrome/app/theme/constrained_bottom_center.png
+++ /dev/null
diff --git a/chrome/app/theme/constrained_bottom_left_corner.png b/chrome/app/theme/constrained_bottom_left_corner.png
deleted file mode 100644
index 4ba2342..0000000
--- a/chrome/app/theme/constrained_bottom_left_corner.png
+++ /dev/null
diff --git a/chrome/app/theme/constrained_bottom_right_corner.png b/chrome/app/theme/constrained_bottom_right_corner.png
deleted file mode 100644
index 8221cc3..0000000
--- a/chrome/app/theme/constrained_bottom_right_corner.png
+++ /dev/null
diff --git a/chrome/app/theme/constrained_left_side.png b/chrome/app/theme/constrained_left_side.png
deleted file mode 100644
index 0a00529..0000000
--- a/chrome/app/theme/constrained_left_side.png
+++ /dev/null
diff --git a/chrome/app/theme/constrained_right_side.png b/chrome/app/theme/constrained_right_side.png
deleted file mode 100644
index 0d97721..0000000
--- a/chrome/app/theme/constrained_right_side.png
+++ /dev/null
diff --git a/chrome/app/theme/constrained_top_center.png b/chrome/app/theme/constrained_top_center.png
deleted file mode 100644
index 89ab107..0000000
--- a/chrome/app/theme/constrained_top_center.png
+++ /dev/null
diff --git a/chrome/app/theme/constrained_top_left_corner.png b/chrome/app/theme/constrained_top_left_corner.png
deleted file mode 100644
index b0ec4a9..0000000
--- a/chrome/app/theme/constrained_top_left_corner.png
+++ /dev/null
diff --git a/chrome/app/theme/constrained_top_right_corner.png b/chrome/app/theme/constrained_top_right_corner.png
deleted file mode 100644
index 7dd550e..0000000
--- a/chrome/app/theme/constrained_top_right_corner.png
+++ /dev/null
diff --git a/chrome/app/theme/content_bottom_center.png b/chrome/app/theme/content_bottom_center.png
index a9bdb3d..efce9cf 100644
--- a/chrome/app/theme/content_bottom_center.png
+++ b/chrome/app/theme/content_bottom_center.png
diff --git a/chrome/app/theme/content_bottom_left_corner.png b/chrome/app/theme/content_bottom_left_corner.png
index 0f0d629..db7b04f 100644
--- a/chrome/app/theme/content_bottom_left_corner.png
+++ b/chrome/app/theme/content_bottom_left_corner.png
diff --git a/chrome/app/theme/content_bottom_right_corner.png b/chrome/app/theme/content_bottom_right_corner.png
index 77fe4ac..d4c0136 100644
--- a/chrome/app/theme/content_bottom_right_corner.png
+++ b/chrome/app/theme/content_bottom_right_corner.png
diff --git a/chrome/app/theme/content_left_side.png b/chrome/app/theme/content_left_side.png
index e952fcb..93bc64b 100644
--- a/chrome/app/theme/content_left_side.png
+++ b/chrome/app/theme/content_left_side.png
diff --git a/chrome/app/theme/content_right_side.png b/chrome/app/theme/content_right_side.png
index 35e3d74..598858b 100644
--- a/chrome/app/theme/content_right_side.png
+++ b/chrome/app/theme/content_right_side.png
diff --git a/chrome/app/theme/content_top_center.png b/chrome/app/theme/content_top_center.png
index 07cd04a..4bd39e3 100644
--- a/chrome/app/theme/content_top_center.png
+++ b/chrome/app/theme/content_top_center.png
diff --git a/chrome/app/theme/content_top_left_corner.png b/chrome/app/theme/content_top_left_corner.png
index 3ca40b6..2baaf4e 100644
--- a/chrome/app/theme/content_top_left_corner.png
+++ b/chrome/app/theme/content_top_left_corner.png
diff --git a/chrome/app/theme/content_top_right_corner.png b/chrome/app/theme/content_top_right_corner.png
index 91fe2de..25fd15a 100644
--- a/chrome/app/theme/content_top_right_corner.png
+++ b/chrome/app/theme/content_top_right_corner.png
diff --git a/chrome/app/theme/dewindow_bottom_center.png b/chrome/app/theme/dewindow_bottom_center.png
deleted file mode 100644
index 78c0409..0000000
--- a/chrome/app/theme/dewindow_bottom_center.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_bottom_center_otr.png b/chrome/app/theme/dewindow_bottom_center_otr.png
deleted file mode 100644
index 8fa9f44..0000000
--- a/chrome/app/theme/dewindow_bottom_center_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_bottom_left_corner.png b/chrome/app/theme/dewindow_bottom_left_corner.png
deleted file mode 100644
index d961eaf..0000000
--- a/chrome/app/theme/dewindow_bottom_left_corner.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_bottom_left_corner_otr.png b/chrome/app/theme/dewindow_bottom_left_corner_otr.png
deleted file mode 100644
index 934aaf9..0000000
--- a/chrome/app/theme/dewindow_bottom_left_corner_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_bottom_right_corner.png b/chrome/app/theme/dewindow_bottom_right_corner.png
deleted file mode 100644
index e5a2e3d..0000000
--- a/chrome/app/theme/dewindow_bottom_right_corner.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_bottom_right_corner_otr.png b/chrome/app/theme/dewindow_bottom_right_corner_otr.png
deleted file mode 100644
index a262d91..0000000
--- a/chrome/app/theme/dewindow_bottom_right_corner_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_left_side.png b/chrome/app/theme/dewindow_left_side.png
deleted file mode 100644
index f84abc3..0000000
--- a/chrome/app/theme/dewindow_left_side.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_left_side_otr.png b/chrome/app/theme/dewindow_left_side_otr.png
deleted file mode 100644
index 4b0fbce..0000000
--- a/chrome/app/theme/dewindow_left_side_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_right_side.png b/chrome/app/theme/dewindow_right_side.png
deleted file mode 100644
index 3e79e27..0000000
--- a/chrome/app/theme/dewindow_right_side.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_right_side_otr.png b/chrome/app/theme/dewindow_right_side_otr.png
deleted file mode 100644
index bf64f90..0000000
--- a/chrome/app/theme/dewindow_right_side_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_top_center.png b/chrome/app/theme/dewindow_top_center.png
deleted file mode 100644
index 6a5ba27..0000000
--- a/chrome/app/theme/dewindow_top_center.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_top_center_otr.png b/chrome/app/theme/dewindow_top_center_otr.png
deleted file mode 100644
index 6b9baf1..0000000
--- a/chrome/app/theme/dewindow_top_center_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_top_left_corner.png b/chrome/app/theme/dewindow_top_left_corner.png
deleted file mode 100644
index d7af76f..0000000
--- a/chrome/app/theme/dewindow_top_left_corner.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_top_left_corner_otr.png b/chrome/app/theme/dewindow_top_left_corner_otr.png
deleted file mode 100644
index c8ca568..0000000
--- a/chrome/app/theme/dewindow_top_left_corner_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_top_right_corner.png b/chrome/app/theme/dewindow_top_right_corner.png
deleted file mode 100644
index ca6659c..0000000
--- a/chrome/app/theme/dewindow_top_right_corner.png
+++ /dev/null
diff --git a/chrome/app/theme/dewindow_top_right_corner_otr.png b/chrome/app/theme/dewindow_top_right_corner_otr.png
deleted file mode 100644
index 3a4300b..0000000
--- a/chrome/app/theme/dewindow_top_right_corner_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/forward.png b/chrome/app/theme/forward.png
index a2dd01d..a1ae190 100644
--- a/chrome/app/theme/forward.png
+++ b/chrome/app/theme/forward.png
diff --git a/chrome/app/theme/forward_d.png b/chrome/app/theme/forward_d.png
index d4a1426..28012fe 100644
--- a/chrome/app/theme/forward_d.png
+++ b/chrome/app/theme/forward_d.png
diff --git a/chrome/app/theme/go.png b/chrome/app/theme/go.png
index 571fb75..c4df2164 100644
--- a/chrome/app/theme/go.png
+++ b/chrome/app/theme/go.png
diff --git a/chrome/app/theme/locationbg.png b/chrome/app/theme/locationbg.png
index 875e47d..974b443 100644
--- a/chrome/app/theme/locationbg.png
+++ b/chrome/app/theme/locationbg.png
diff --git a/chrome/app/theme/menu_chrome.png b/chrome/app/theme/menu_chrome.png
index aabd07d..6fc9f5c 100644
--- a/chrome/app/theme/menu_chrome.png
+++ b/chrome/app/theme/menu_chrome.png
diff --git a/chrome/app/theme/menu_page.png b/chrome/app/theme/menu_page.png
index 10b8def..75897ef 100644
--- a/chrome/app/theme/menu_page.png
+++ b/chrome/app/theme/menu_page.png
diff --git a/chrome/app/theme/notused.png b/chrome/app/theme/notused.png
new file mode 100644
index 0000000..42ad610
--- /dev/null
+++ b/chrome/app/theme/notused.png
diff --git a/chrome/app/theme/ntp_background.png b/chrome/app/theme/ntp_background.png
new file mode 100644
index 0000000..fb75b9f
--- /dev/null
+++ b/chrome/app/theme/ntp_background.png
diff --git a/chrome/app/theme/reload.png b/chrome/app/theme/reload.png
index 20ab352..f63d5188 100644
--- a/chrome/app/theme/reload.png
+++ b/chrome/app/theme/reload.png
diff --git a/chrome/app/theme/reload_d.png b/chrome/app/theme/reload_d.png
index 15a6a1e..ec5811a 100644
--- a/chrome/app/theme/reload_d.png
+++ b/chrome/app/theme/reload_d.png
diff --git a/chrome/app/theme/star.png b/chrome/app/theme/star.png
index 6284d4a..987aa04 100644
--- a/chrome/app/theme/star.png
+++ b/chrome/app/theme/star.png
diff --git a/chrome/app/theme/star_d.png b/chrome/app/theme/star_d.png
index a6111a5..cf23eda 100644
--- a/chrome/app/theme/star_d.png
+++ b/chrome/app/theme/star_d.png
diff --git a/chrome/app/theme/starred.png b/chrome/app/theme/starred.png
index 1b20148..bf0ba85 100644
--- a/chrome/app/theme/starred.png
+++ b/chrome/app/theme/starred.png
diff --git a/chrome/app/theme/stop.png b/chrome/app/theme/stop.png
index 8b91fca..f25d62a 100644
--- a/chrome/app/theme/stop.png
+++ b/chrome/app/theme/stop.png
diff --git a/chrome/app/theme/tab_active_center.png b/chrome/app/theme/tab_active_center.png
index 653b8fe..24b9a64 100644
--- a/chrome/app/theme/tab_active_center.png
+++ b/chrome/app/theme/tab_active_center.png
diff --git a/chrome/app/theme/tab_active_left.png b/chrome/app/theme/tab_active_left.png
index 65d627c..b926a48 100644
--- a/chrome/app/theme/tab_active_left.png
+++ b/chrome/app/theme/tab_active_left.png
diff --git a/chrome/app/theme/tab_active_right.png b/chrome/app/theme/tab_active_right.png
index b7d6134..bec77a2 100644
--- a/chrome/app/theme/tab_active_right.png
+++ b/chrome/app/theme/tab_active_right.png
diff --git a/chrome/app/theme/tab_hover_center.png b/chrome/app/theme/tab_hover_center.png
deleted file mode 100644
index 4a639da..0000000
--- a/chrome/app/theme/tab_hover_center.png
+++ /dev/null
diff --git a/chrome/app/theme/tab_hover_left.png b/chrome/app/theme/tab_hover_left.png
deleted file mode 100644
index cedd81d..0000000
--- a/chrome/app/theme/tab_hover_left.png
+++ /dev/null
diff --git a/chrome/app/theme/tab_hover_right.png b/chrome/app/theme/tab_hover_right.png
deleted file mode 100644
index 3bda1fd..0000000
--- a/chrome/app/theme/tab_hover_right.png
+++ /dev/null
diff --git a/chrome/app/theme/tab_inactive_center.png b/chrome/app/theme/tab_inactive_center.png
index 1cb0ce2..50b6826 100644
--- a/chrome/app/theme/tab_inactive_center.png
+++ b/chrome/app/theme/tab_inactive_center.png
diff --git a/chrome/app/theme/tab_inactive_center_otr.png b/chrome/app/theme/tab_inactive_center_otr.png
deleted file mode 100644
index 781635c..0000000
--- a/chrome/app/theme/tab_inactive_center_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/tab_inactive_center_v.png b/chrome/app/theme/tab_inactive_center_v.png
deleted file mode 100644
index bdc9591..0000000
--- a/chrome/app/theme/tab_inactive_center_v.png
+++ /dev/null
diff --git a/chrome/app/theme/tab_inactive_left.png b/chrome/app/theme/tab_inactive_left.png
index 31fc0ca..67f0bbc 100644
--- a/chrome/app/theme/tab_inactive_left.png
+++ b/chrome/app/theme/tab_inactive_left.png
diff --git a/chrome/app/theme/tab_inactive_left_otr.png b/chrome/app/theme/tab_inactive_left_otr.png
deleted file mode 100644
index 99c5af5..0000000
--- a/chrome/app/theme/tab_inactive_left_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/tab_inactive_left_v.png b/chrome/app/theme/tab_inactive_left_v.png
deleted file mode 100644
index cf9477f..0000000
--- a/chrome/app/theme/tab_inactive_left_v.png
+++ /dev/null
diff --git a/chrome/app/theme/tab_inactive_right.png b/chrome/app/theme/tab_inactive_right.png
index 3fce47d..fae4add 100644
--- a/chrome/app/theme/tab_inactive_right.png
+++ b/chrome/app/theme/tab_inactive_right.png
diff --git a/chrome/app/theme/tab_inactive_right_otr.png b/chrome/app/theme/tab_inactive_right_otr.png
deleted file mode 100644
index 6b5bc26..0000000
--- a/chrome/app/theme/tab_inactive_right_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/tab_inactive_right_v.png b/chrome/app/theme/tab_inactive_right_v.png
deleted file mode 100644
index 82aac4d..0000000
--- a/chrome/app/theme/tab_inactive_right_v.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_frame_default.png b/chrome/app/theme/theme_frame_default.png
new file mode 100644
index 0000000..3f4f7e9
--- /dev/null
+++ b/chrome/app/theme/theme_frame_default.png
diff --git a/chrome/app/theme/theme_frame_default_inactive.png b/chrome/app/theme/theme_frame_default_inactive.png
new file mode 100644
index 0000000..a1eff41
--- /dev/null
+++ b/chrome/app/theme/theme_frame_default_inactive.png
diff --git a/chrome/app/theme/theme_frame_default_incognito.png b/chrome/app/theme/theme_frame_default_incognito.png
new file mode 100644
index 0000000..179ea6c
--- /dev/null
+++ b/chrome/app/theme/theme_frame_default_incognito.png
diff --git a/chrome/app/theme/theme_frame_default_incognito_inactive.png b/chrome/app/theme/theme_frame_default_incognito_inactive.png
new file mode 100644
index 0000000..a86b08c
--- /dev/null
+++ b/chrome/app/theme/theme_frame_default_incognito_inactive.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index ee1f619..c89f5db 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -75,9 +75,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_TAB_INACTIVE_LEFT_OTR" file="tab_inactive_left_otr.png" type="BINDATA" />
-      <include name="IDR_TAB_INACTIVE_CENTER_OTR" file="tab_inactive_center_otr.png" type="BINDATA" />
-      <include name="IDR_TAB_INACTIVE_RIGHT_OTR" file="tab_inactive_right_otr.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" />
@@ -87,36 +84,9 @@
       <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_WINDOW_BOTTOM_CENTER_OTR" file="window_bottom_center_otr.png" type="BINDATA" />
-      <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR" file="window_bottom_left_corner_otr.png" type="BINDATA" />
-      <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR" file="window_bottom_right_corner_otr.png" type="BINDATA" />
-      <include name="IDR_WINDOW_LEFT_SIDE_OTR" file="window_left_side_otr.png" type="BINDATA" />
-      <include name="IDR_WINDOW_RIGHT_SIDE_OTR" file="window_right_side_otr.png" type="BINDATA" />
-      <include name="IDR_WINDOW_TOP_CENTER_OTR" file="window_top_center_otr.png" type="BINDATA" />
-      <include name="IDR_WINDOW_TOP_LEFT_CORNER_OTR" file="window_top_left_corner_otr.png" type="BINDATA" />
-      <include name="IDR_WINDOW_TOP_RIGHT_CORNER_OTR" file="window_top_right_corner_otr.png" type="BINDATA" />
-      <include name="IDR_TAB_INACTIVE_CENTER_V" file="tab_inactive_center_v.png" type="BINDATA" />
-      <include name="IDR_TAB_INACTIVE_LEFT_V" file="tab_inactive_left_v.png" type="BINDATA" />
-      <include name="IDR_TAB_INACTIVE_RIGHT_V" file="tab_inactive_right_v.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_DEWINDOW_BOTTOM_CENTER" file="dewindow_bottom_center.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_BOTTOM_LEFT_CORNER" file="dewindow_bottom_left_corner.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_BOTTOM_RIGHT_CORNER" file="dewindow_bottom_right_corner.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_LEFT_SIDE" file="dewindow_left_side.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_RIGHT_SIDE" file="dewindow_right_side.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_TOP_CENTER" file="dewindow_top_center.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_TOP_LEFT_CORNER" file="dewindow_top_left_corner.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_TOP_RIGHT_CORNER" file="dewindow_top_right_corner.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_BOTTOM_CENTER_OTR" file="dewindow_bottom_center_otr.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_BOTTOM_LEFT_CORNER_OTR" file="dewindow_bottom_left_corner_otr.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_BOTTOM_RIGHT_CORNER_OTR" file="dewindow_bottom_right_corner_otr.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_LEFT_SIDE_OTR" file="dewindow_left_side_otr.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_RIGHT_SIDE_OTR" file="dewindow_right_side_otr.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_TOP_CENTER_OTR" file="dewindow_top_center_otr.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_TOP_LEFT_CORNER_OTR" file="dewindow_top_left_corner_otr.png" type="BINDATA" />
-      <include name="IDR_DEWINDOW_TOP_RIGHT_CORNER_OTR" file="dewindow_top_right_corner_otr.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" />
@@ -161,14 +131,6 @@
       <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="download_progress_background32.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="download_progress_foreground32.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_ICON" file="download_icon.png" type="BINDATA" />
-      <include name="IDR_CONSTRAINED_BOTTOM_CENTER" file="constrained_bottom_center.png" type="BINDATA" />
-      <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER" file="constrained_bottom_left_corner.png" type="BINDATA" />
-      <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER" file="constrained_bottom_right_corner.png" type="BINDATA" />
-      <include name="IDR_CONSTRAINED_LEFT_SIDE" file="constrained_left_side.png" type="BINDATA" />
-      <include name="IDR_CONSTRAINED_RIGHT_SIDE" file="constrained_right_side.png" type="BINDATA" />
-      <include name="IDR_CONSTRAINED_TOP_CENTER" file="constrained_top_center.png" type="BINDATA" />
-      <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER" file="constrained_top_left_corner.png" type="BINDATA" />
-      <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER" file="constrained_top_right_corner.png" type="BINDATA" />
       <include name="IDR_FIND_BOX_BACKGROUND" file="find_box_bg.png" type="BINDATA" />
       <include name="IDR_FIND_BOX_BACKGROUND_LEFT" file="find_box_bg_left.png" type="BINDATA" />
       <include name="IDR_FIND_BOX_BACKGROUND_LEFT_RTL" file="find_box_bg_left_rtl.png" type="BINDATA" />
@@ -292,9 +254,6 @@
       <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_TAB_HOVER_LEFT" file="tab_hover_left.png" type="BINDATA" />
-      <include name="IDR_TAB_HOVER_CENTER" file="tab_hover_center.png" type="BINDATA" />
-      <include name="IDR_TAB_HOVER_RIGHT" file="tab_hover_right.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" />
@@ -306,6 +265,8 @@
       <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" />
       <include name="IDR_DOCK_HIGH" file="dock_tab_high.png" type="BINDATA" />
       <include name="IDR_DOCK_WIDE" file="dock_tab_wide.png" type="BINDATA" />
@@ -335,6 +296,16 @@
       <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" />
+      <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
+      <include name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="theme_tab_background_incognito.png" type="BINDATA" />
+      <include name="IDR_THEME_TAB_BACKGROUND_V" file="theme_tab_background_glass.png" type="BINDATA" />
+      <include name="IDR_THEME_NEWTAB_BACKGROUND" file="ntp_background.png" type="BINDATA" />
+      
       <if expr="pp_ifdef('_google_chrome')">
         <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_background.png" type="BINDATA" />
         <include name="IDR_ABOUT_BACKGROUND_RTL" file="google_chrome/about_background_rtl.png" type="BINDATA" />
@@ -359,5 +330,11 @@
         <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" />
       </if>
     </includes>
+    <messages>
+      <message name="IDS_COLOR_FRAME" use_name_for_id="true">frame</message>
+      <message name="IDS_COLOR_TOOLBAR" use_name_for_id="true">toolbar</message>
+      <message name="IDS_COLOR_TEXT_TAB" use_name_for_id="true">text_tab</message>
+      <message name="IDS_TINT_BUTTONS" use_name_for_id="true">buttons</message>
+    </messages>
   </release>
 </grit>
diff --git a/chrome/app/theme/theme_tab_background.png b/chrome/app/theme/theme_tab_background.png
new file mode 100644
index 0000000..d043bc3
--- /dev/null
+++ b/chrome/app/theme/theme_tab_background.png
diff --git a/chrome/app/theme/theme_tab_background_glass.png b/chrome/app/theme/theme_tab_background_glass.png
new file mode 100644
index 0000000..df43d6f
--- /dev/null
+++ b/chrome/app/theme/theme_tab_background_glass.png
diff --git a/chrome/app/theme/theme_tab_background_incognito.png b/chrome/app/theme/theme_tab_background_incognito.png
new file mode 100644
index 0000000..042c243
--- /dev/null
+++ b/chrome/app/theme/theme_tab_background_incognito.png
diff --git a/chrome/app/theme/theme_toolbar_default.png b/chrome/app/theme/theme_toolbar_default.png
new file mode 100644
index 0000000..21678f8
--- /dev/null
+++ b/chrome/app/theme/theme_toolbar_default.png
diff --git a/chrome/app/theme/window_bottom_center.png b/chrome/app/theme/window_bottom_center.png
index e6a191c..3fb76f1 100644
--- a/chrome/app/theme/window_bottom_center.png
+++ b/chrome/app/theme/window_bottom_center.png
diff --git a/chrome/app/theme/window_bottom_center_otr.png b/chrome/app/theme/window_bottom_center_otr.png
deleted file mode 100644
index 8d6cdb0..0000000
--- a/chrome/app/theme/window_bottom_center_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/window_bottom_left_corner.png b/chrome/app/theme/window_bottom_left_corner.png
index db9cb72..1d3c066 100644
--- a/chrome/app/theme/window_bottom_left_corner.png
+++ b/chrome/app/theme/window_bottom_left_corner.png
diff --git a/chrome/app/theme/window_bottom_left_corner_otr.png b/chrome/app/theme/window_bottom_left_corner_otr.png
deleted file mode 100644
index 803f2b8..0000000
--- a/chrome/app/theme/window_bottom_left_corner_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/window_bottom_right_corner.png b/chrome/app/theme/window_bottom_right_corner.png
index f0522a3..83cf5b9 100644
--- a/chrome/app/theme/window_bottom_right_corner.png
+++ b/chrome/app/theme/window_bottom_right_corner.png
diff --git a/chrome/app/theme/window_bottom_right_corner_otr.png b/chrome/app/theme/window_bottom_right_corner_otr.png
deleted file mode 100644
index b21c63f..0000000
--- a/chrome/app/theme/window_bottom_right_corner_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/window_left_side.png b/chrome/app/theme/window_left_side.png
index d614d2c..2553d1b 100644
--- a/chrome/app/theme/window_left_side.png
+++ b/chrome/app/theme/window_left_side.png
diff --git a/chrome/app/theme/window_left_side_otr.png b/chrome/app/theme/window_left_side_otr.png
deleted file mode 100644
index f632f049..0000000
--- a/chrome/app/theme/window_left_side_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/window_right_side.png b/chrome/app/theme/window_right_side.png
index 97939ef..c89b47b 100644
--- a/chrome/app/theme/window_right_side.png
+++ b/chrome/app/theme/window_right_side.png
diff --git a/chrome/app/theme/window_right_side_otr.png b/chrome/app/theme/window_right_side_otr.png
deleted file mode 100644
index ac6bdc1..0000000
--- a/chrome/app/theme/window_right_side_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/window_top_center.png b/chrome/app/theme/window_top_center.png
index 8e13cc2..e2c393e 100644
--- a/chrome/app/theme/window_top_center.png
+++ b/chrome/app/theme/window_top_center.png
diff --git a/chrome/app/theme/window_top_center_otr.png b/chrome/app/theme/window_top_center_otr.png
deleted file mode 100644
index 49b3ab1..0000000
--- a/chrome/app/theme/window_top_center_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/window_top_left_corner.png b/chrome/app/theme/window_top_left_corner.png
index 89e5f23..4bb52ce 100644
--- a/chrome/app/theme/window_top_left_corner.png
+++ b/chrome/app/theme/window_top_left_corner.png
diff --git a/chrome/app/theme/window_top_left_corner_otr.png b/chrome/app/theme/window_top_left_corner_otr.png
deleted file mode 100644
index 9521ae0b..0000000
--- a/chrome/app/theme/window_top_left_corner_otr.png
+++ /dev/null
diff --git a/chrome/app/theme/window_top_right_corner.png b/chrome/app/theme/window_top_right_corner.png
index 60686b3..d1da9ca 100644
--- a/chrome/app/theme/window_top_right_corner.png
+++ b/chrome/app/theme/window_top_right_corner.png
diff --git a/chrome/app/theme/window_top_right_corner_otr.png b/chrome/app/theme/window_top_right_corner_otr.png
deleted file mode 100644
index 0b05ca1..0000000
--- a/chrome/app/theme/window_top_right_corner_otr.png
+++ /dev/null