roll back r15177

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

154 files changed, 218 insertions, 840 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 8baad6e..5d892eb3 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -291,6 +291,12 @@ each locale. -->
       </message>
 
       <!-- Generic terms -->
+      <message name="IDS_OK" desc="Used for Ok on buttons">
+        OK
+      </message>
+      <message name="IDS_CANCEL" desc="Used for Cancel on buttons">
+        Cancel
+      </message>
       <message name="IDS_DELETE" desc="A delete button or menu">
         &amp;Delete
       </message>
@@ -448,6 +454,21 @@ each locale. -->
       <message name="IDS_NEW_INCOGNITO_WINDOW" desc="The text label of the New incognito window menu item">
         New &amp;incognito window
       </message>
+      <message name="IDS_UNDO" desc="The text label of the Undo menu item">
+        &amp;Undo
+      </message>
+      <message name="IDS_CUT" desc="The text label of the Cut menu item">
+        Cu&amp;t
+      </message>
+      <message name="IDS_COPY" desc="The text label of the Copy menu item">
+        &amp;Copy
+      </message>
+      <message name="IDS_PASTE" desc="The text label of the Paste menu item">
+        &amp;Paste
+      </message>
+      <message name="IDS_SELECT_ALL" desc="The text label of the Select All menu item">
+        Select &amp;all
+      </message>
       <message name="IDS_FIND" desc="The text label of the Find in Page menu item">
         &amp;Find in page
       </message>
@@ -560,6 +581,11 @@ each locale. -->
         R&amp;eopen closed window
       </message>
 
+      <!-- This really belongs under Generic Terms above. -->
+      <message name="IDS_CLOSE" desc="A generic term for Close on buttons and menus.">
+        Close
+      </message>
+
       <!-- XPFrame buttons tooltips -->
       <message name="IDS_XPFRAME_MINIMIZE_TOOLTIP" desc="The tooltip used for the minimize button">
         Minimize
@@ -1979,6 +2005,11 @@ each locale. -->
         See all pages in history containing <ph name="SEARCH_TERMS">$1<ex>flowers</ex></ph>
       </message>
 
+      <!-- Native Frame menu -->
+      <message name="IDS_ALWAYS_ON_TOP" desc="The optional menu in native frame windows for setting the window to be always on top">
+        Always on top
+      </message>
+
       <!--Tooltip strings-->
       <message name="IDS_TOOLTIP_BACK" desc="The tooltip for back button">
         Click to go back, hold to see history
@@ -2009,6 +2040,9 @@ each locale. -->
       </message>
 
       <!--Accessible name/action strings-->
+      <message name="IDS_ACCACTION_PRESS" desc="The accessible default action for a button.">
+        Press
+      </message>
       <message name="IDS_ACCNAME_BACK" desc="The accessible name for the back button.">
         Back
       </message>
@@ -2809,6 +2843,46 @@ each locale. -->
       <message name="IDS_HTTP_POST_WARNING_CANCEL" desc="Cancel button for post warning">
         Cancel
       </message>
+      
+      <!-- Menus -->
+      <message name="IDS_MENU_EMPTY_SUBMENU" desc="Used when a submenu has no entries">
+        (empty)
+      </message>
+
+      <!-- Scroll Bar Context Menu Labels -->
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLHERE" desc="The label for the 'Scroll Here' item">
+        Scroll to Here
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLLEFTEDGE" desc="The label for the 'Left Edge' item">
+        Left Edge
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE" desc="The label for the 'Right Edge' item">
+        Right Edge
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLHOME" desc="The label for the 'Top' item">
+        Top
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLEND" desc="The label for the 'Bottom' item">
+        Bottom
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLPAGEUP" desc="The label for the 'Page Up' item">
+        Page Up
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN" desc="The label for the 'Page Down' item">
+        Page Down
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLLEFT" desc="The label for the 'Scroll Left' item">
+        Scroll Left
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLRIGHT" desc="The label for the 'Scroll Left' item">
+        Scroll Right
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLUP" desc="The label for the 'Scroll Up' item">
+        Scroll Up
+      </message>
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLDOWN" desc="The label for the 'Scroll Down' item">
+        Scroll Down
+      </message>
 
       <!-- First-run messages -->
       <message name="IDS_FIRSTRUN_DLG_CANCEL" desc="Text for CANCEL button on first-run dialog">
@@ -3425,6 +3499,64 @@ each locale. -->
         JavaScript Debugger - Running
       </message>
 
+      <!-- Shortcut Modifiers -->
+      <message name="IDS_CONTROL_MODIFIER" desc="Control key shortcut modifier">
+        Ctrl+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
+      </message>
+      <message name="IDS_ALT_MODIFIER" desc="Alt key shortcut modifier">
+        Alt+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
+      </message>
+      <message name="IDS_SHIFT_MODIFIER" desc="Shift key shortcut modifier">
+        Shift+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
+      </message>
+      
+      <!-- Key names -->
+      <message name="IDS_ESC_KEY" desc="Escape key">
+        Esc
+      </message>
+      <message name="IDS_TAB_KEY" desc="Tab key">
+        Tab
+      </message>
+      <message name="IDS_INSERT_KEY" desc="Insert key">
+        Ins
+      </message>
+      <message name="IDS_HOME_KEY" desc="Home key">
+        Home
+      </message>
+      <message name="IDS_DELETE_KEY" desc="Delete key">
+        Del
+      </message>
+      <message name="IDS_END_KEY" desc="End key">
+        End
+      </message>
+      <message name="IDS_PAGEUP_KEY" desc="Page up key">
+        PgUp
+      </message>
+      <message name="IDS_PAGEDOWN_KEY" desc="Page down key">
+        PgDwn
+      </message>
+      <message name="IDS_LEFT_ARROW_KEY" desc="Left arrow key">
+        Left Arrow
+      </message>
+      <message name="IDS_RIGHT_ARROW_KEY" desc="Right arrow key">
+        Right Arrow
+      </message>
+      <message name="IDS_RIGHT_UP_KEY" desc="Up arrow key">
+        Up Arrow
+      </message>
+      <message name="IDS_RIGHT_DOWN_KEY" desc="Down arrow key">
+        Down Arrow
+      </message>
+      <message name="IDS_ENTER_KEY" desc="Enter key">
+        Enter
+      </message>
+      <message name="IDS_F1_KEY" desc="F1 key">
+        F1
+      </message>
+      <message name="IDS_F11_KEY" desc="F11 key">
+        F11
+      </message>
+
       <!-- Strings used in local directory listings -->
       <message name="IDS_DIRECTORY_LISTING_HEADER" desc="When viewing a local directory, this is the title of the page.">
         Index of <ph name="LOCATION">LOCATION<ex>c:\Documents and Settings</ex></ph>
diff --git a/chrome/app/locales/ar.vcproj b/chrome/app/locales/ar.vcproj
index 50489cf..e972e43 100644
--- a/chrome/app/locales/ar.vcproj
+++ b/chrome/app/locales/ar.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_ar.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ar.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/bg.vcproj b/chrome/app/locales/bg.vcproj
index aefdbf5..beecc27 100644
--- a/chrome/app/locales/bg.vcproj
+++ b/chrome/app/locales/bg.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_bg.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_bg.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/bn.vcproj b/chrome/app/locales/bn.vcproj
index bfd43d8..6f585cb 100644
--- a/chrome/app/locales/bn.vcproj
+++ b/chrome/app/locales/bn.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_bn.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_bn.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/ca.vcproj b/chrome/app/locales/ca.vcproj
index 29b530b..d5245f9 100644
--- a/chrome/app/locales/ca.vcproj
+++ b/chrome/app/locales/ca.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_ca.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ca.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/cs.vcproj b/chrome/app/locales/cs.vcproj
index 3b3ce18..b4fd610 100644
--- a/chrome/app/locales/cs.vcproj
+++ b/chrome/app/locales/cs.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_cs.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_cs.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/da.vcproj b/chrome/app/locales/da.vcproj
index 7c1e844..9fbf9f7 100644
--- a/chrome/app/locales/da.vcproj
+++ b/chrome/app/locales/da.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_da.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_da.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/de.vcproj b/chrome/app/locales/de.vcproj
index 5d87c8d..8291075 100644
--- a/chrome/app/locales/de.vcproj
+++ b/chrome/app/locales/de.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_de.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_de.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/el.vcproj b/chrome/app/locales/el.vcproj
index a323c52..8e0ba03 100644
--- a/chrome/app/locales/el.vcproj
+++ b/chrome/app/locales/el.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_el.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_el.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/en-GB.vcproj b/chrome/app/locales/en-GB.vcproj
index e334f01..944fdb9 100644
--- a/chrome/app/locales/en-GB.vcproj
+++ b/chrome/app/locales/en-GB.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_en-GB.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-GB.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/en-US.vcproj b/chrome/app/locales/en-US.vcproj
index cc47993..ea6c3be 100644
--- a/chrome/app/locales/en-US.vcproj
+++ b/chrome/app/locales/en-US.vcproj
@@ -150,10 +150,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_en-US.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-US.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/es-419.vcproj b/chrome/app/locales/es-419.vcproj
index 3679a71..b4673e1 100644
--- a/chrome/app/locales/es-419.vcproj
+++ b/chrome/app/locales/es-419.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_es-419.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_es-419.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/es.vcproj b/chrome/app/locales/es.vcproj
index aa6d494..a3b0761 100644
--- a/chrome/app/locales/es.vcproj
+++ b/chrome/app/locales/es.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_es.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_es.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/et.vcproj b/chrome/app/locales/et.vcproj
index ed29edd..00806f6 100644
--- a/chrome/app/locales/et.vcproj
+++ b/chrome/app/locales/et.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_et.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_et.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/fi.vcproj b/chrome/app/locales/fi.vcproj
index 864c481..7284f68 100644
--- a/chrome/app/locales/fi.vcproj
+++ b/chrome/app/locales/fi.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_fi.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fi.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/fil.vcproj b/chrome/app/locales/fil.vcproj
index b3f1bdc..1566861 100644
--- a/chrome/app/locales/fil.vcproj
+++ b/chrome/app/locales/fil.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_fil.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fil.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/fr.vcproj b/chrome/app/locales/fr.vcproj
index 50ad834..816d4d8 100644
--- a/chrome/app/locales/fr.vcproj
+++ b/chrome/app/locales/fr.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_fr.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fr.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/gu.vcproj b/chrome/app/locales/gu.vcproj
index 146c495..0ae14f6 100644
--- a/chrome/app/locales/gu.vcproj
+++ b/chrome/app/locales/gu.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_gu.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_gu.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/he.vcproj b/chrome/app/locales/he.vcproj
index 4ceb54f..191adaa 100644
--- a/chrome/app/locales/he.vcproj
+++ b/chrome/app/locales/he.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_he.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_he.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/hi.vcproj b/chrome/app/locales/hi.vcproj
index 41fa4f0..4fb374b 100644
--- a/chrome/app/locales/hi.vcproj
+++ b/chrome/app/locales/hi.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_hi.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hi.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/hr.vcproj b/chrome/app/locales/hr.vcproj
index 363e479..1d7f4d5 100644
--- a/chrome/app/locales/hr.vcproj
+++ b/chrome/app/locales/hr.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_hr.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hr.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/hu.vcproj b/chrome/app/locales/hu.vcproj
index 4d95457..bb1a1a6 100644
--- a/chrome/app/locales/hu.vcproj
+++ b/chrome/app/locales/hu.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_hu.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hu.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/id.vcproj b/chrome/app/locales/id.vcproj
index 3fee7cf..17bc92a 100644
--- a/chrome/app/locales/id.vcproj
+++ b/chrome/app/locales/id.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_id.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_id.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/it.vcproj b/chrome/app/locales/it.vcproj
index 8888397..bb8632f 100644
--- a/chrome/app/locales/it.vcproj
+++ b/chrome/app/locales/it.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_it.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_it.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/ja.vcproj b/chrome/app/locales/ja.vcproj
index 544ff15..8b88fc8 100644
--- a/chrome/app/locales/ja.vcproj
+++ b/chrome/app/locales/ja.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_ja.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ja.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/kn.vcproj b/chrome/app/locales/kn.vcproj
index 12684a2..7179c08 100644
--- a/chrome/app/locales/kn.vcproj
+++ b/chrome/app/locales/kn.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_kn.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_kn.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/ko.vcproj b/chrome/app/locales/ko.vcproj
index d1a4905..91dc2b0 100644
--- a/chrome/app/locales/ko.vcproj
+++ b/chrome/app/locales/ko.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_ko.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ko.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/lt.vcproj b/chrome/app/locales/lt.vcproj
index 91dc13b..170c078 100644
--- a/chrome/app/locales/lt.vcproj
+++ b/chrome/app/locales/lt.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_lt.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_lt.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/lv.vcproj b/chrome/app/locales/lv.vcproj
index 7894b82..3e8aa3a 100644
--- a/chrome/app/locales/lv.vcproj
+++ b/chrome/app/locales/lv.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_lv.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_lv.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/ml.vcproj b/chrome/app/locales/ml.vcproj
index 8e72fb6..6b37f02 100644
--- a/chrome/app/locales/ml.vcproj
+++ b/chrome/app/locales/ml.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_ml.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ml.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/mr.vcproj b/chrome/app/locales/mr.vcproj
index afc7a81..ba0b230 100644
--- a/chrome/app/locales/mr.vcproj
+++ b/chrome/app/locales/mr.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_mr.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_mr.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/nb.vcproj b/chrome/app/locales/nb.vcproj
index d85bcdf..ddd5d60 100644
--- a/chrome/app/locales/nb.vcproj
+++ b/chrome/app/locales/nb.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_nb.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_nb.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/nl.vcproj b/chrome/app/locales/nl.vcproj
index f3ca341..5964888 100644
--- a/chrome/app/locales/nl.vcproj
+++ b/chrome/app/locales/nl.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_nl.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_nl.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/or.vcproj b/chrome/app/locales/or.vcproj
index 07e7b0c..04779ec 100644
--- a/chrome/app/locales/or.vcproj
+++ b/chrome/app/locales/or.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_or.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_or.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/pl.vcproj b/chrome/app/locales/pl.vcproj
index a7c651a..186b933 100644
--- a/chrome/app/locales/pl.vcproj
+++ b/chrome/app/locales/pl.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_pl.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pl.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/pt-BR.vcproj b/chrome/app/locales/pt-BR.vcproj
index 3b97ca5..fa4293c 100644
--- a/chrome/app/locales/pt-BR.vcproj
+++ b/chrome/app/locales/pt-BR.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_pt-BR.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pt-BR.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/pt-PT.vcproj b/chrome/app/locales/pt-PT.vcproj
index 6bedf2c..600077e 100644
--- a/chrome/app/locales/pt-PT.vcproj
+++ b/chrome/app/locales/pt-PT.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_pt-PT.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pt-PT.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/ro.vcproj b/chrome/app/locales/ro.vcproj
index f9821fd..e662853 100644
--- a/chrome/app/locales/ro.vcproj
+++ b/chrome/app/locales/ro.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_ro.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ro.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/ru.vcproj b/chrome/app/locales/ru.vcproj
index 0d2b38e..0acec23 100644
--- a/chrome/app/locales/ru.vcproj
+++ b/chrome/app/locales/ru.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_ru.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ru.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/sk.vcproj b/chrome/app/locales/sk.vcproj
index c003d8e..4772679 100644
--- a/chrome/app/locales/sk.vcproj
+++ b/chrome/app/locales/sk.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_sk.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sk.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/sl.vcproj b/chrome/app/locales/sl.vcproj
index 1695895..a468384 100644
--- a/chrome/app/locales/sl.vcproj
+++ b/chrome/app/locales/sl.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_sl.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sl.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/sr.vcproj b/chrome/app/locales/sr.vcproj
index 40e3543..8fa065c 100644
--- a/chrome/app/locales/sr.vcproj
+++ b/chrome/app/locales/sr.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_sr.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sr.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/sv.vcproj b/chrome/app/locales/sv.vcproj
index 9acee08..aef7ba0 100644
--- a/chrome/app/locales/sv.vcproj
+++ b/chrome/app/locales/sv.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_sv.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sv.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/ta.vcproj b/chrome/app/locales/ta.vcproj
index 6dd1fe0..7b6360b 100644
--- a/chrome/app/locales/ta.vcproj
+++ b/chrome/app/locales/ta.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_ta.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ta.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/te.vcproj b/chrome/app/locales/te.vcproj
index d5e1f8a..4b29924 100644
--- a/chrome/app/locales/te.vcproj
+++ b/chrome/app/locales/te.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_te.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_te.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/th.vcproj b/chrome/app/locales/th.vcproj
index 8e812708..3e6cef3 100644
--- a/chrome/app/locales/th.vcproj
+++ b/chrome/app/locales/th.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_th.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_th.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/tr.vcproj b/chrome/app/locales/tr.vcproj
index f4fb401..fe691d9 100644
--- a/chrome/app/locales/tr.vcproj
+++ b/chrome/app/locales/tr.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_tr.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_tr.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/uk.vcproj b/chrome/app/locales/uk.vcproj
index 77ba70d..ecff800 100644
--- a/chrome/app/locales/uk.vcproj
+++ b/chrome/app/locales/uk.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_uk.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_uk.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/vi.vcproj b/chrome/app/locales/vi.vcproj
index c76f42e..1223af8 100644
--- a/chrome/app/locales/vi.vcproj
+++ b/chrome/app/locales/vi.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_vi.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_vi.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/zh-CN.vcproj b/chrome/app/locales/zh-CN.vcproj
index c33e7b7..c9c3288 100644
--- a/chrome/app/locales/zh-CN.vcproj
+++ b/chrome/app/locales/zh-CN.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_zh-CN.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-CN.rc"
 			>
 		</File>
diff --git a/chrome/app/locales/zh-TW.vcproj b/chrome/app/locales/zh-TW.vcproj
index e110052..6e3b2fb 100644
--- a/chrome/app/locales/zh-TW.vcproj
+++ b/chrome/app/locales/zh-TW.vcproj
@@ -148,10 +148,6 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_strings_zh-TW.rc"
-			>
-		</File>
-		<File
 			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-TW.rc"
 			>
 		</File>
diff --git a/chrome/views/resources/app_top_center.png b/chrome/app/theme/app_top_center.png
index 863ff19..863ff19 100644
--- a/chrome/views/resources/app_top_center.png
+++ b/chrome/app/theme/app_top_center.png
diff --git a/chrome/views/resources/app_top_left.png b/chrome/app/theme/app_top_left.png
index 79723bc..79723bc 100644
--- a/chrome/views/resources/app_top_left.png
+++ b/chrome/app/theme/app_top_left.png
diff --git a/chrome/views/resources/app_top_right.png b/chrome/app/theme/app_top_right.png
index b00c3ea..b00c3ea 100644
--- a/chrome/views/resources/app_top_right.png
+++ b/chrome/app/theme/app_top_right.png
diff --git a/chrome/views/resources/close.png b/chrome/app/theme/close.png
index 6217569..6217569 100644
--- a/chrome/views/resources/close.png
+++ b/chrome/app/theme/close.png
diff --git a/chrome/views/resources/close_h.png b/chrome/app/theme/close_h.png
index 9921435..9921435 100644
--- a/chrome/views/resources/close_h.png
+++ b/chrome/app/theme/close_h.png
diff --git a/chrome/views/resources/close_p.png b/chrome/app/theme/close_p.png
index 0487e4a..0487e4a 100644
--- a/chrome/views/resources/close_p.png
+++ b/chrome/app/theme/close_p.png
diff --git a/chrome/views/resources/close_sa.png b/chrome/app/theme/close_sa.png
index 12ae813..12ae813 100644
--- a/chrome/views/resources/close_sa.png
+++ b/chrome/app/theme/close_sa.png
diff --git a/chrome/views/resources/close_sa_h.png b/chrome/app/theme/close_sa_h.png
index d5a7a42..d5a7a42 100644
--- a/chrome/views/resources/close_sa_h.png
+++ b/chrome/app/theme/close_sa_h.png
diff --git a/chrome/views/resources/close_sa_p.png b/chrome/app/theme/close_sa_p.png
index c1d7c91..c1d7c91 100644
--- a/chrome/views/resources/close_sa_p.png
+++ b/chrome/app/theme/close_sa_p.png
diff --git a/chrome/views/resources/content_bottom_center.png b/chrome/app/theme/content_bottom_center.png
index a9bdb3d..a9bdb3d 100644
--- a/chrome/views/resources/content_bottom_center.png
+++ b/chrome/app/theme/content_bottom_center.png
diff --git a/chrome/views/resources/content_bottom_left_corner.png b/chrome/app/theme/content_bottom_left_corner.png
index 0f0d629..0f0d629 100644
--- a/chrome/views/resources/content_bottom_left_corner.png
+++ b/chrome/app/theme/content_bottom_left_corner.png
diff --git a/chrome/views/resources/content_bottom_right_corner.png b/chrome/app/theme/content_bottom_right_corner.png
index 77fe4ac..77fe4ac 100644
--- a/chrome/views/resources/content_bottom_right_corner.png
+++ b/chrome/app/theme/content_bottom_right_corner.png
diff --git a/chrome/views/resources/content_left_side.png b/chrome/app/theme/content_left_side.png
index e952fcb..e952fcb 100644
--- a/chrome/views/resources/content_left_side.png
+++ b/chrome/app/theme/content_left_side.png
diff --git a/chrome/views/resources/content_right_side.png b/chrome/app/theme/content_right_side.png
index 35e3d74..35e3d74 100644
--- a/chrome/views/resources/content_right_side.png
+++ b/chrome/app/theme/content_right_side.png
diff --git a/chrome/views/resources/dewindow_bottom_center.png b/chrome/app/theme/dewindow_bottom_center.png
index 78c0409..78c0409 100644
--- a/chrome/views/resources/dewindow_bottom_center.png
+++ b/chrome/app/theme/dewindow_bottom_center.png
diff --git a/chrome/views/resources/dewindow_bottom_left_corner.png b/chrome/app/theme/dewindow_bottom_left_corner.png
index d961eaf..d961eaf 100644
--- a/chrome/views/resources/dewindow_bottom_left_corner.png
+++ b/chrome/app/theme/dewindow_bottom_left_corner.png
diff --git a/chrome/views/resources/dewindow_bottom_right_corner.png b/chrome/app/theme/dewindow_bottom_right_corner.png
index e5a2e3d..e5a2e3d 100644
--- a/chrome/views/resources/dewindow_bottom_right_corner.png
+++ b/chrome/app/theme/dewindow_bottom_right_corner.png
diff --git a/chrome/views/resources/dewindow_left_side.png b/chrome/app/theme/dewindow_left_side.png
index f84abc3..f84abc3 100644
--- a/chrome/views/resources/dewindow_left_side.png
+++ b/chrome/app/theme/dewindow_left_side.png
diff --git a/chrome/views/resources/dewindow_right_side.png b/chrome/app/theme/dewindow_right_side.png
index 3e79e27..3e79e27 100644
--- a/chrome/views/resources/dewindow_right_side.png
+++ b/chrome/app/theme/dewindow_right_side.png
diff --git a/chrome/views/resources/dewindow_top_center.png b/chrome/app/theme/dewindow_top_center.png
index 6a5ba27..6a5ba27 100644
--- a/chrome/views/resources/dewindow_top_center.png
+++ b/chrome/app/theme/dewindow_top_center.png
diff --git a/chrome/views/resources/dewindow_top_left_corner.png b/chrome/app/theme/dewindow_top_left_corner.png
index d7af76f..d7af76f 100644
--- a/chrome/views/resources/dewindow_top_left_corner.png
+++ b/chrome/app/theme/dewindow_top_left_corner.png
diff --git a/chrome/views/resources/dewindow_top_right_corner.png b/chrome/app/theme/dewindow_top_right_corner.png
index ca6659c..ca6659c 100644
--- a/chrome/views/resources/dewindow_top_right_corner.png
+++ b/chrome/app/theme/dewindow_top_right_corner.png
diff --git a/chrome/views/resources/folder_closed.png b/chrome/app/theme/folder_closed.png
index 746fab9..746fab9 100644
--- a/chrome/views/resources/folder_closed.png
+++ b/chrome/app/theme/folder_closed.png
diff --git a/chrome/views/resources/folder_closed_rtl.png b/chrome/app/theme/folder_closed_rtl.png
index dbd0b0a..dbd0b0a 100644
--- a/chrome/views/resources/folder_closed_rtl.png
+++ b/chrome/app/theme/folder_closed_rtl.png
diff --git a/chrome/views/resources/folder_open.png b/chrome/app/theme/folder_open.png
index 3276810..3276810 100644
--- a/chrome/views/resources/folder_open.png
+++ b/chrome/app/theme/folder_open.png
diff --git a/chrome/views/resources/folder_open_rtl.png b/chrome/app/theme/folder_open_rtl.png
index 9ba7069..9ba7069 100644
--- a/chrome/views/resources/folder_open_rtl.png
+++ b/chrome/app/theme/folder_open_rtl.png
diff --git a/chrome/views/resources/input_alert.png b/chrome/app/theme/input_alert.png
index 503a545..503a545 100644
--- a/chrome/views/resources/input_alert.png
+++ b/chrome/app/theme/input_alert.png
diff --git a/chrome/views/resources/input_good.png b/chrome/app/theme/input_good.png
index 1646cd5..1646cd5 100644
--- a/chrome/views/resources/input_good.png
+++ b/chrome/app/theme/input_good.png
diff --git a/chrome/views/resources/input_unknown.png b/chrome/app/theme/input_unknown.png
index 0a5484d..0a5484d 100644
--- a/chrome/views/resources/input_unknown.png
+++ b/chrome/app/theme/input_unknown.png
diff --git a/chrome/views/resources/maximize.png b/chrome/app/theme/maximize.png
index 5fb89e2..5fb89e2 100644
--- a/chrome/views/resources/maximize.png
+++ b/chrome/app/theme/maximize.png
diff --git a/chrome/views/resources/maximize_h.png b/chrome/app/theme/maximize_h.png
index ab326b1..ab326b1 100644
--- a/chrome/views/resources/maximize_h.png
+++ b/chrome/app/theme/maximize_h.png
diff --git a/chrome/views/resources/maximize_p.png b/chrome/app/theme/maximize_p.png
index 6c92c75..6c92c75 100644
--- a/chrome/views/resources/maximize_p.png
+++ b/chrome/app/theme/maximize_p.png
diff --git a/chrome/views/resources/minimize.png b/chrome/app/theme/minimize.png
index fe0ab2f..fe0ab2f 100644
--- a/chrome/views/resources/minimize.png
+++ b/chrome/app/theme/minimize.png
diff --git a/chrome/views/resources/minimize_h.png b/chrome/app/theme/minimize_h.png
index 6bceb24..6bceb24 100644
--- a/chrome/views/resources/minimize_h.png
+++ b/chrome/app/theme/minimize_h.png
diff --git a/chrome/views/resources/minimize_p.png b/chrome/app/theme/minimize_p.png
index 62b2f77..62b2f77 100644
--- a/chrome/views/resources/minimize_p.png
+++ b/chrome/app/theme/minimize_p.png
diff --git a/chrome/views/resources/restore.png b/chrome/app/theme/restore.png
index bb70f2d..bb70f2d 100644
--- a/chrome/views/resources/restore.png
+++ b/chrome/app/theme/restore.png
diff --git a/chrome/views/resources/restore_h.png b/chrome/app/theme/restore_h.png
index 96851ef..96851ef 100644
--- a/chrome/views/resources/restore_h.png
+++ b/chrome/app/theme/restore_h.png
diff --git a/chrome/views/resources/restore_p.png b/chrome/app/theme/restore_p.png
index 96851ef..96851ef 100644
--- a/chrome/views/resources/restore_p.png
+++ b/chrome/app/theme/restore_p.png
diff --git a/chrome/views/resources/textbutton_b_h.png b/chrome/app/theme/textbutton_b_h.png
index 169db96..169db96 100644
--- a/chrome/views/resources/textbutton_b_h.png
+++ b/chrome/app/theme/textbutton_b_h.png
diff --git a/chrome/views/resources/textbutton_b_p.png b/chrome/app/theme/textbutton_b_p.png
index f1fb512..f1fb512 100644
--- a/chrome/views/resources/textbutton_b_p.png
+++ b/chrome/app/theme/textbutton_b_p.png
diff --git a/chrome/views/resources/textbutton_bl_h.png b/chrome/app/theme/textbutton_bl_h.png
index f45f0e8..f45f0e8 100644
--- a/chrome/views/resources/textbutton_bl_h.png
+++ b/chrome/app/theme/textbutton_bl_h.png
diff --git a/chrome/views/resources/textbutton_bl_p.png b/chrome/app/theme/textbutton_bl_p.png
index 06712be..06712be 100644
--- a/chrome/views/resources/textbutton_bl_p.png
+++ b/chrome/app/theme/textbutton_bl_p.png
diff --git a/chrome/views/resources/textbutton_br_h.png b/chrome/app/theme/textbutton_br_h.png
index e8f3b1f..e8f3b1f 100644
--- a/chrome/views/resources/textbutton_br_h.png
+++ b/chrome/app/theme/textbutton_br_h.png
diff --git a/chrome/views/resources/textbutton_br_p.png b/chrome/app/theme/textbutton_br_p.png
index a84c385..a84c385 100644
--- a/chrome/views/resources/textbutton_br_p.png
+++ b/chrome/app/theme/textbutton_br_p.png
diff --git a/chrome/views/resources/textbutton_c_h.png b/chrome/app/theme/textbutton_c_h.png
index 6188590..6188590 100644
--- a/chrome/views/resources/textbutton_c_h.png
+++ b/chrome/app/theme/textbutton_c_h.png
diff --git a/chrome/views/resources/textbutton_c_p.png b/chrome/app/theme/textbutton_c_p.png
index 2925888..2925888 100644
--- a/chrome/views/resources/textbutton_c_p.png
+++ b/chrome/app/theme/textbutton_c_p.png
diff --git a/chrome/views/resources/textbutton_l_h.png b/chrome/app/theme/textbutton_l_h.png
index 4e3b7ab..4e3b7ab 100644
--- a/chrome/views/resources/textbutton_l_h.png
+++ b/chrome/app/theme/textbutton_l_h.png
diff --git a/chrome/views/resources/textbutton_l_p.png b/chrome/app/theme/textbutton_l_p.png
index 8641049..8641049 100644
--- a/chrome/views/resources/textbutton_l_p.png
+++ b/chrome/app/theme/textbutton_l_p.png
diff --git a/chrome/views/resources/textbutton_r_h.png b/chrome/app/theme/textbutton_r_h.png
index 946c5ef..946c5ef 100644
--- a/chrome/views/resources/textbutton_r_h.png
+++ b/chrome/app/theme/textbutton_r_h.png
diff --git a/chrome/views/resources/textbutton_r_p.png b/chrome/app/theme/textbutton_r_p.png
index e4f7f34..e4f7f34 100644
--- a/chrome/views/resources/textbutton_r_p.png
+++ b/chrome/app/theme/textbutton_r_p.png
diff --git a/chrome/views/resources/textbutton_t_h.png b/chrome/app/theme/textbutton_t_h.png
index 11285e0..11285e0 100644
--- a/chrome/views/resources/textbutton_t_h.png
+++ b/chrome/app/theme/textbutton_t_h.png
diff --git a/chrome/views/resources/textbutton_t_p.png b/chrome/app/theme/textbutton_t_p.png
index c212b4f..c212b4f 100644
--- a/chrome/views/resources/textbutton_t_p.png
+++ b/chrome/app/theme/textbutton_t_p.png
diff --git a/chrome/views/resources/textbutton_tl_h.png b/chrome/app/theme/textbutton_tl_h.png
index 51208bc..51208bc 100644
--- a/chrome/views/resources/textbutton_tl_h.png
+++ b/chrome/app/theme/textbutton_tl_h.png
diff --git a/chrome/views/resources/textbutton_tl_p.png b/chrome/app/theme/textbutton_tl_p.png
index 6422023..6422023 100644
--- a/chrome/views/resources/textbutton_tl_p.png
+++ b/chrome/app/theme/textbutton_tl_p.png
diff --git a/chrome/views/resources/textbutton_tr_h.png b/chrome/app/theme/textbutton_tr_h.png
index f07e92ff..f07e92ff 100644
--- a/chrome/views/resources/textbutton_tr_h.png
+++ b/chrome/app/theme/textbutton_tr_h.png
diff --git a/chrome/views/resources/textbutton_tr_p.png b/chrome/app/theme/textbutton_tr_p.png
index ab87ec6..ab87ec6 100644
--- a/chrome/views/resources/textbutton_tr_p.png
+++ b/chrome/app/theme/textbutton_tr_p.png
diff --git a/chrome/app/theme/theme_dll.vcproj b/chrome/app/theme/theme_dll.vcproj
index 8a8efeb..1ec5d14 100644
--- a/chrome/app/theme/theme_dll.vcproj
+++ b/chrome/app/theme/theme_dll.vcproj
@@ -143,10 +143,6 @@
 			RelativePath="$(OutDir)\grit_derived_sources\theme_resources.rc"
 			>
 		</File>
-		<File
-			RelativePath="$(OutDir)\grit_derived_sources\views_resources.rc"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 2550d70..7d70b99 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -17,6 +17,14 @@
       <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" />
@@ -27,6 +35,8 @@
       <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" />
@@ -39,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" />
@@ -63,9 +79,15 @@
       <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_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_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_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" />
@@ -74,6 +96,20 @@
       <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" />
@@ -137,6 +173,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" />
@@ -176,6 +215,24 @@
       <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
       <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.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" />
@@ -213,6 +270,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" />
@@ -226,6 +286,8 @@
       <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" />
@@ -234,6 +296,8 @@
       <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" />
       <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" />
diff --git a/chrome/views/resources/throbber.png b/chrome/app/theme/throbber.png
index 6ca1fdd..6ca1fdd 100644
--- a/chrome/views/resources/throbber.png
+++ b/chrome/app/theme/throbber.png
diff --git a/chrome/views/resources/window_bottom_center.png b/chrome/app/theme/window_bottom_center.png
index e6a191c..e6a191c 100644
--- a/chrome/views/resources/window_bottom_center.png
+++ b/chrome/app/theme/window_bottom_center.png
diff --git a/chrome/views/resources/window_bottom_left_corner.png b/chrome/app/theme/window_bottom_left_corner.png
index db9cb72..db9cb72 100644
--- a/chrome/views/resources/window_bottom_left_corner.png
+++ b/chrome/app/theme/window_bottom_left_corner.png
diff --git a/chrome/views/resources/window_bottom_right_corner.png b/chrome/app/theme/window_bottom_right_corner.png
index f0522a3..f0522a3 100644
--- a/chrome/views/resources/window_bottom_right_corner.png
+++ b/chrome/app/theme/window_bottom_right_corner.png
diff --git a/chrome/views/resources/window_left_side.png b/chrome/app/theme/window_left_side.png
index d614d2c..d614d2c 100644
--- a/chrome/views/resources/window_left_side.png
+++ b/chrome/app/theme/window_left_side.png
diff --git a/chrome/views/resources/window_right_side.png b/chrome/app/theme/window_right_side.png
index 97939ef..97939ef 100644
--- a/chrome/views/resources/window_right_side.png
+++ b/chrome/app/theme/window_right_side.png
diff --git a/chrome/views/resources/window_top_center.png b/chrome/app/theme/window_top_center.png
index 8e13cc2..8e13cc2 100644
--- a/chrome/views/resources/window_top_center.png
+++ b/chrome/app/theme/window_top_center.png
diff --git a/chrome/views/resources/window_top_left_corner.png b/chrome/app/theme/window_top_left_corner.png
index 89e5f23..89e5f23 100644
--- a/chrome/views/resources/window_top_left_corner.png
+++ b/chrome/app/theme/window_top_left_corner.png
diff --git a/chrome/views/resources/window_top_right_corner.png b/chrome/app/theme/window_top_right_corner.png
index 60686b3..60686b3 100644
--- a/chrome/views/resources/window_top_right_corner.png
+++ b/chrome/app/theme/window_top_right_corner.png
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 61439b6..4543c30 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -41,7 +41,6 @@
 #include "chrome/views/focus/focus_util_win.h"
 #include "googleurl/src/url_util.h"
 #include "grit/generated_resources.h"
-#include "grit/views_strings.h"
 #include "skia/ext/skia_utils_win.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc
index c7a143a..039cd83 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu.cc
@@ -18,7 +18,6 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
-#include "grit/views_strings.h"
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
diff --git a/chrome/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc
index a6f2f56..9a466fb 100644
--- a/chrome/browser/tab_contents/infobar_delegate.cc
+++ b/chrome/browser/tab_contents/infobar_delegate.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/l10n_util.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 
 // InfoBarDelegate: ------------------------------------------------------------
 
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 815d2ac..131d9e0 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -27,7 +27,6 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
-#include "grit/views_strings.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 912e25f..9c38f12 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -20,7 +20,6 @@
 #include "chrome/views/controls/text_field.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_strings.h"
 
 using views::ComboBox;
 using views::ColumnSet;
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 855d89b..0b00f6a 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -17,7 +17,6 @@
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/views_strings.h"
 #include "net/url_request/url_request_context.h"
 
 using base::Time;
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index dfa5a32..bd58c47 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -34,7 +34,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 #include "net/base/net_util.h"
 
 using base::TimeDelta;
diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index d2dda5f..8173849 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -22,7 +22,6 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 
 using views::GridLayout;
 using views::ImageView;
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 5a00d51..6039045 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -63,7 +63,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_strings.h"
 #include "grit/webkit_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 4d87db7..770245f 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -11,7 +11,6 @@
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/window_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 957cc1d..567b615 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -19,7 +19,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 7a07810..7263505 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -27,7 +27,7 @@
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
-#include "grit/views_resources.h"
+#include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkBitmap.h"
 
diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index 7a5d10f..e9728cb 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -10,7 +10,6 @@
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/views_strings.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // RestartMessageBox, public:
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index cbc3b77..e9da07e 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -16,7 +16,6 @@
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 
 static bool g_initialized = false;
 static SkBitmap* g_default_fav_icon = NULL;
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index d8d74b2..107af980 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -20,7 +20,6 @@
 #include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 #include "skia/ext/image_operations.h"
 
 static const int kLeftPadding = 16;
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index a6f38f2..81ea797 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -52,7 +52,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_strings.h"
 #include "net/base/net_util.h"
 
 static const int kControlHorizOffset = 4;
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 600b75c..cd77cb3 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -70,8 +70,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "views\views.vcproj
 	ProjectSection(ProjectDependencies) = postProject
 		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47} = {F0D8C703-8784-43A0-9EAD-2CF671F91C47}
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076} = {FBB4EB78-A429-4417-B513-44BA6C6D5076}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sqlite\sqlite.vcproj", "{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}"
@@ -1493,12 +1491,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_tests_launcher", "t
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcmalloc", "..\third_party\tcmalloc\tcmalloc.vcproj", "{C564F145-9172-42C3-BFCB-60FDEA124321}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Views", "Views", "{53171FEC-4877-4D41-9898-4275A817A7A7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views_strings", "views\resources\views_strings.vcproj", "{F0D8C703-8784-43A0-9EAD-2CF671F91C47}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views_resources", "views\resources\views_resources.vcproj", "{FBB4EB78-A429-4417-B513-44BA6C6D5076}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -2765,14 +2757,6 @@ Global
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.ActiveCfg = Release|Win32
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.Build.0 = Release|Win32
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47}.Debug|Win32.Build.0 = Debug|Win32
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47}.Release|Win32.ActiveCfg = Release|Win32
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47}.Release|Win32.Build.0 = Release|Win32
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2836,14 +2820,6 @@ Global
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.ActiveCfg = Release|Win32
 		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.Build.0 = Release|Win32
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076}.Debug|Win32.Build.0 = Debug|Win32
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076}.Release|Win32.ActiveCfg = Release|Win32
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076}.Release|Win32.Build.0 = Release|Win32
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2913,7 +2889,6 @@ Global
 		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{53171FEC-4877-4D41-9898-4275A817A7A7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{5597AD47-3494-4750-A235-4F9C2F864700} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{5916D37D-8C97-424F-A904-74E52594C2D6} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
@@ -2928,7 +2903,7 @@ Global
 		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{6AE76406-B03B-11DD-94B1-80B556D89593} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {53171FEC-4877-4D41-9898-4275A817A7A7}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
@@ -3028,7 +3003,6 @@ Global
 		{ED19720A-8F14-D3FC-9C6D-EEB5AE4D5BD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{F0D8C703-8784-43A0-9EAD-2CF671F91C47} = {53171FEC-4877-4D41-9898-4275A817A7A7}
 		{F22022F0-2D3B-5610-4E80-C674A8E01C5A} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
@@ -3037,7 +3011,6 @@ Global
 		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{FBB4EB78-A429-4417-B513-44BA6C6D5076} = {53171FEC-4877-4D41-9898-4275A817A7A7}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
 	EndGlobalSection
diff --git a/chrome/views/accelerator.cc b/chrome/views/accelerator.cc
index ef2dcd0..9bbda74 100644
--- a/chrome/views/accelerator.cc
+++ b/chrome/views/accelerator.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/common/l10n_util.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/button/button_dropdown.cc b/chrome/views/controls/button/button_dropdown.cc
index 403bb78..89abf85 100644
--- a/chrome/views/controls/button/button_dropdown.cc
+++ b/chrome/views/controls/button/button_dropdown.cc
@@ -8,7 +8,7 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/controls/menu/view_menu_delegate.h"
 #include "chrome/views/widget/widget.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/button/image_button.cc b/chrome/views/controls/button/image_button.cc
index 49db3c6..235cc83 100644
--- a/chrome/views/controls/button/image_button.cc
+++ b/chrome/views/controls/button/image_button.cc
@@ -8,6 +8,7 @@
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/throb_animation.h"
+#include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 
 namespace views {
diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc
index e3a031a..4687132 100644
--- a/chrome/views/controls/button/menu_button.cc
+++ b/chrome/views/controls/button/menu_button.cc
@@ -14,7 +14,7 @@
 #include "chrome/views/event.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 using base::Time;
diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc
index bd7282b..a273d20 100644
--- a/chrome/views/controls/button/text_button.cc
+++ b/chrome/views/controls/button/text_button.cc
@@ -10,7 +10,8 @@
 #include "chrome/common/throb_animation.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/event.h"
-#include "grit/views_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 #if defined(OS_WIN)
 #include "chrome/common/win_util.h"
diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc
index dc0a24b..64bee99 100644
--- a/chrome/views/controls/menu/chrome_menu.cc
+++ b/chrome/views/controls/menu/chrome_menu.cc
@@ -25,7 +25,7 @@
 #include "chrome/views/view_constants.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget_win.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
 
 #undef min
diff --git a/chrome/views/controls/message_box_view.cc b/chrome/views/controls/message_box_view.cc
index dad36cf..afa2319 100644
--- a/chrome/views/controls/message_box_view.cc
+++ b/chrome/views/controls/message_box_view.cc
@@ -14,6 +14,7 @@
 #include "chrome/common/message_box_flags.h"
 #include "chrome/views/controls/button/checkbox.h"
 #include "chrome/views/window/client_view.h"
+#include "grit/generated_resources.h"
 
 static const int kDefaultMessageWidth = 320;
 
diff --git a/chrome/views/controls/scroll_view.cc b/chrome/views/controls/scroll_view.cc
index 66f927e..49787ed 100644
--- a/chrome/views/controls/scroll_view.cc
+++ b/chrome/views/controls/scroll_view.cc
@@ -8,6 +8,7 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/controls/scrollbar/native_scroll_bar.h"
 #include "chrome/views/widget/root_view.h"
+#include "grit/theme_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
index 4bd5d2d..42ba4e7 100644
--- a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -10,7 +10,7 @@
 #include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/controls/scroll_view.h"
 #include "chrome/views/widget/widget.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 #include "skia/include/SkBitmap.h"
 
 #undef min
diff --git a/chrome/views/controls/text_field.cc b/chrome/views/controls/text_field.cc
index 3d6bf55..93a41e9 100644
--- a/chrome/views/controls/text_field.cc
+++ b/chrome/views/controls/text_field.cc
@@ -26,7 +26,7 @@
 #include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/focus/focus_util_win.h"
 #include "chrome/views/widget/widget.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
 
 using gfx::NativeTheme;
diff --git a/chrome/views/controls/throbber.cc b/chrome/views/controls/throbber.cc
index 58d1ac8..8d5a902 100644
--- a/chrome/views/controls/throbber.cc
+++ b/chrome/views/controls/throbber.cc
@@ -8,7 +8,7 @@
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/resource_bundle.h"
-#include "grit/views_resources.h"
+#include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
 
 using base::Time;
diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc
index 0da388b..7677828 100644
--- a/chrome/views/controls/tree/tree_view.cc
+++ b/chrome/views/controls/tree/tree_view.cc
@@ -15,7 +15,7 @@
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/widget/widget.h"
-#include "grit/views_resources.h"
+#include "grit/theme_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/resources/views_resources.grd b/chrome/views/resources/views_resources.grd
deleted file mode 100644
index 3ae884e..0000000
--- a/chrome/views/resources/views_resources.grd
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1">
-  <outputs>
-    <output filename="grit/views_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="views_resources.rc" type="rc_all" />
-    <output filename="views_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <!-- Window frame 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_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_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" />
-
-      <!-- Active window frame parts -->
-      <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" />
-
-      <!-- Inactive window frame parts -->
-      <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" />
-
-      <!-- Client edge parts -->
-      <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 types -->
-      <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_INPUT_UNKNOWN" file="input_unknown.png" type="BINDATA" />
-
-      <!-- Tree Folder -->
-      <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" />
-
-      <!-- Text button -->
-      <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" />
-    </includes>
-  </release>
-</grit>
diff --git a/chrome/views/resources/views_resources.vcproj b/chrome/views/resources/views_resources.vcproj
deleted file mode 100644
index d1e365c..0000000
--- a/chrome/views/resources/views_resources.vcproj
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="views_resources"

-	ProjectGUID="{FBB4EB78-A429-4417-B513-44BA6C6D5076}"

-	RootNamespace="views_resources"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-		<ToolFile

-			RelativePath="..\..\..\tools\grit\build\grit_resources.rules"

-		/>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="GRIT Generated Resources"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="GRIT Generated Resources"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Generated Files"

-			SourceControlFiles="false"

-			>

-			<File

-				RelativePath="$(OutDir)\grit_derived_sources\grit\views_resources.h"

-				>

-			</File>

-		</Filter>

-		<File

-			RelativePath=".\views_resources.grd"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/chrome/views/resources/views_strings.grd b/chrome/views/resources/views_strings.grd
deleted file mode 100644
index 2e2896a..0000000
--- a/chrome/views/resources/views_strings.grd
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This file contains definitions of resources that will be translated for
-each locale. Specifically, these are UI strings that are used by views that
-need to be translated for each locale.-->
-
-<grit base_dir="." latest_public_release="0" current_release="1"
-      source_lang_id="en" enc_check="möl">
-  <outputs>
-    <!-- TODO add each of your output files.  Modify the three below, and add
-    your own for your various languages.  See the user's guide
-    (http://wiki/Main/GritUsersGuide) for more details.
-    Note that all output references are relative to the output directory
-    which is specified at build time. -->
-    <output filename="grit/views_strings.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="views_strings_ar.rc" type="rc_all" lang="ar" />
-    <output filename="views_strings_bg.rc" type="rc_all" lang="bg" />
-    <output filename="views_strings_bn.rc" type="rc_all" lang="bn" />
-    <output filename="views_strings_ca.rc" type="rc_all" lang="ca" />
-    <output filename="views_strings_cs.rc" type="rc_all" lang="cs" />
-    <output filename="views_strings_da.rc" type="rc_all" lang="da" />
-    <output filename="views_strings_de.rc" type="rc_all" lang="de" />
-    <output filename="views_strings_el.rc" type="rc_all" lang="el" />
-    <output filename="views_strings_en-GB.rc" type="rc_all" lang="en-GB" />
-    <output filename="views_strings_en-US.rc" type="rc_all" lang="en" />
-    <output filename="views_strings_es.rc" type="rc_all" lang="es" />
-    <output filename="views_strings_es-419.rc" type="rc_all" lang="es-419" />
-    <output filename="views_strings_et.rc" type="rc_all" lang="et" />
-    <output filename="views_strings_fi.rc" type="rc_all" lang="fi" />
-    <output filename="views_strings_fil.rc" type="rc_all" lang="fil" />
-    <output filename="views_strings_fr.rc" type="rc_all" lang="fr" />
-    <output filename="views_strings_gu.rc" type="rc_all" lang="gu" />
-    <output filename="views_strings_he.rc" type="rc_all" lang="he" />
-    <output filename="views_strings_hi.rc" type="rc_all" lang="hi" />
-    <output filename="views_strings_hr.rc" type="rc_all" lang="hr" />
-    <output filename="views_strings_hu.rc" type="rc_all" lang="hu" />
-    <output filename="views_strings_id.rc" type="rc_all" lang="id" />
-    <output filename="views_strings_it.rc" type="rc_all" lang="it" />
-    <output filename="views_strings_ja.rc" type="rc_all" lang="ja" />
-    <output filename="views_strings_kn.rc" type="rc_all" lang="kn" />
-    <output filename="views_strings_ko.rc" type="rc_all" lang="ko" />
-    <output filename="views_strings_lt.rc" type="rc_all" lang="lt" />
-    <output filename="views_strings_lv.rc" type="rc_all" lang="lv" />
-    <output filename="views_strings_ml.rc" type="rc_all" lang="ml" />
-    <output filename="views_strings_mr.rc" type="rc_all" lang="mr" />
-    <output filename="views_strings_nl.rc" type="rc_all" lang="nl" />
-    <!-- The translation console uses 'no' for Norwegian Bokmål. It should
-         be 'nb'. -->
-    <output filename="views_strings_nb.rc" type="rc_all" lang="no" />
-    <output filename="views_strings_or.rc" type="rc_all" lang="or" />
-    <output filename="views_strings_pl.rc" type="rc_all" lang="pl" />
-    <output filename="views_strings_pt-BR.rc" type="rc_all" lang="pt-BR" />
-    <output filename="views_strings_pt-PT.rc" type="rc_all" lang="pt-PT" />
-    <output filename="views_strings_ro.rc" type="rc_all" lang="ro" />
-    <output filename="views_strings_ru.rc" type="rc_all" lang="ru" />
-    <output filename="views_strings_sk.rc" type="rc_all" lang="sk" />
-    <output filename="views_strings_sl.rc" type="rc_all" lang="sl" />
-    <output filename="views_strings_sr.rc" type="rc_all" lang="sr" />
-    <output filename="views_strings_sv.rc" type="rc_all" lang="sv" />
-    <output filename="views_strings_ta.rc" type="rc_all" lang="ta" />
-    <output filename="views_strings_te.rc" type="rc_all" lang="te" />
-    <output filename="views_strings_th.rc" type="rc_all" lang="th" />
-    <output filename="views_strings_tr.rc" type="rc_all" lang="tr" />
-    <output filename="views_strings_uk.rc" type="rc_all" lang="uk" />
-    <output filename="views_strings_vi.rc" type="rc_all" lang="vi" />
-    <output filename="views_strings_zh-CN.rc" type="rc_all" lang="zh-CN" />
-    <output filename="views_strings_zh-TW.rc" type="rc_all" lang="zh-TW" />
-
-    <output filename="views_strings_ar.pak" type="data_package" lang="ar" />
-    <output filename="views_strings_bg.pak" type="data_package" lang="bg" />
-    <output filename="views_strings_bn.pak" type="data_package" lang="bn" />
-    <output filename="views_strings_ca.pak" type="data_package" lang="ca" />
-    <output filename="views_strings_cs.pak" type="data_package" lang="cs" />
-    <output filename="views_strings_da.pak" type="data_package" lang="da" />
-    <output filename="views_strings_de.pak" type="data_package" lang="de" />
-    <output filename="views_strings_el.pak" type="data_package" lang="el" />
-    <output filename="views_strings_en-GB.pak" type="data_package" lang="en-GB" />
-    <output filename="views_strings_en-US.pak" type="data_package" lang="en" />
-    <output filename="views_strings_es.pak" type="data_package" lang="es" />
-    <output filename="views_strings_es-419.pak" type="data_package" lang="es-419" />
-    <output filename="views_strings_et.pak" type="data_package" lang="et" />
-    <output filename="views_strings_fi.pak" type="data_package" lang="fi" />
-    <output filename="views_strings_fil.pak" type="data_package" lang="fil" />
-    <output filename="views_strings_fr.pak" type="data_package" lang="fr" />
-    <output filename="views_strings_gu.pak" type="data_package" lang="gu" />
-    <output filename="views_strings_he.pak" type="data_package" lang="he" />
-    <output filename="views_strings_hi.pak" type="data_package" lang="hi" />
-    <output filename="views_strings_hr.pak" type="data_package" lang="hr" />
-    <output filename="views_strings_hu.pak" type="data_package" lang="hu" />
-    <output filename="views_strings_id.pak" type="data_package" lang="id" />
-    <output filename="views_strings_it.pak" type="data_package" lang="it" />
-    <output filename="views_strings_ja.pak" type="data_package" lang="ja" />
-    <output filename="views_strings_kn.pak" type="data_package" lang="kn" />
-    <output filename="views_strings_ko.pak" type="data_package" lang="ko" />
-    <output filename="views_strings_lt.pak" type="data_package" lang="lt" />
-    <output filename="views_strings_lv.pak" type="data_package" lang="lv" />
-    <output filename="views_strings_ml.pak" type="data_package" lang="ml" />
-    <output filename="views_strings_mr.pak" type="data_package" lang="mr" />
-    <output filename="views_strings_nl.pak" type="data_package" lang="nl" />
-    <!-- The translation console uses 'no' for Norwegian Bokmål. It should
-         be 'nb'. -->
-    <output filename="views_strings_nb.pak" type="data_package" lang="no" />
-    <output filename="views_strings_or.pak" type="data_package" lang="or" />
-    <output filename="views_strings_pl.pak" type="data_package" lang="pl" />
-    <output filename="views_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
-    <output filename="views_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
-    <output filename="views_strings_ro.pak" type="data_package" lang="ro" />
-    <output filename="views_strings_ru.pak" type="data_package" lang="ru" />
-    <output filename="views_strings_sk.pak" type="data_package" lang="sk" />
-    <output filename="views_strings_sl.pak" type="data_package" lang="sl" />
-    <output filename="views_strings_sr.pak" type="data_package" lang="sr" />
-    <output filename="views_strings_sv.pak" type="data_package" lang="sv" />
-    <output filename="views_strings_ta.pak" type="data_package" lang="ta" />
-    <output filename="views_strings_te.pak" type="data_package" lang="te" />
-    <output filename="views_strings_th.pak" type="data_package" lang="th" />
-    <output filename="views_strings_tr.pak" type="data_package" lang="tr" />
-    <output filename="views_strings_uk.pak" type="data_package" lang="uk" />
-    <output filename="views_strings_vi.pak" type="data_package" lang="vi" />
-    <output filename="views_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
-    <output filename="views_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
-  </outputs>
-  <translations>
-    <!--
-    These are commented out until we have XTBs!
-    <file path="resources/views_strings_ar.xtb" lang="ar" />
-    <file path="resources/views_strings_bg.xtb" lang="bg" />
-    <file path="resources/views_strings_bn.xtb" lang="bn" />
-    <file path="resources/views_strings_ca.xtb" lang="ca" />
-    <file path="resources/views_strings_cs.xtb" lang="cs" />
-    <file path="resources/views_strings_da.xtb" lang="da" />
-    <file path="resources/views_strings_de.xtb" lang="de" />
-    <file path="resources/views_strings_el.xtb" lang="el" />
-    <file path="resources/views_strings_en-GB.xtb" lang="en-GB" />
-    <file path="resources/views_strings_es.xtb" lang="es" />
-    <file path="resources/views_strings_es-419.xtb" lang="es-419" />
-    <file path="resources/views_strings_et.xtb" lang="et" />
-    <file path="resources/views_strings_fi.xtb" lang="fi" />
-    <file path="resources/views_strings_fil.xtb" lang="fil" />
-    <file path="resources/views_strings_fr.xtb" lang="fr" />
-    <file path="resources/views_strings_gu.xtb" lang="gu" />
-    <file path="resources/views_strings_he.xtb" lang="he" />
-    <file path="resources/views_strings_hi.xtb" lang="hi" />
-    <file path="resources/views_strings_hr.xtb" lang="hr" />
-    <file path="resources/views_strings_hu.xtb" lang="hu" />
-    <file path="resources/views_strings_id.xtb" lang="id" />
-    <file path="resources/views_strings_it.xtb" lang="it" />
-    <file path="resources/views_strings_ja.xtb" lang="ja" />
-    <file path="resources/views_strings_kn.xtb" lang="kn" />
-    <file path="resources/views_strings_ko.xtb" lang="ko" />
-    <file path="resources/views_strings_lt.xtb" lang="lt" />
-    <file path="resources/views_strings_lv.xtb" lang="lv" />
-    <file path="resources/views_strings_ml.xtb" lang="ml" />
-    <file path="resources/views_strings_mr.xtb" lang="mr" />
-    <file path="resources/views_strings_nl.xtb" lang="nl" />
-    <file path="resources/views_strings_no.xtb" lang="no" />
-    <file path="resources/views_strings_or.xtb" lang="or" />
-    <file path="resources/views_strings_pl.xtb" lang="pl" />
-    <file path="resources/views_strings_pt-BR.xtb" lang="pt-BR" />
-    <file path="resources/views_strings_pt-PT.xtb" lang="pt-PT" />
-    <file path="resources/views_strings_ro.xtb" lang="ro" />
-    <file path="resources/views_strings_ru.xtb" lang="ru" />
-    <file path="resources/views_strings_sk.xtb" lang="sk" />
-    <file path="resources/views_strings_sl.xtb" lang="sl" />
-    <file path="resources/views_strings_sr.xtb" lang="sr" />
-    <file path="resources/views_strings_sv.xtb" lang="sv" />
-    <file path="resources/views_strings_ta.xtb" lang="ta" />
-    <file path="resources/views_strings_te.xtb" lang="te" />
-    <file path="resources/views_strings_th.xtb" lang="th" />
-    <file path="resources/views_strings_tr.xtb" lang="tr" />
-    <file path="resources/views_strings_uk.xtb" lang="uk" />
-    <file path="resources/views_strings_vi.xtb" lang="vi" />
-    <file path="resources/views_strings_zh-CN.xtb" lang="zh-CN" />
-    <file path="resources/views_strings_zh-TW.xtb" lang="zh-TW" />
-    -->
-  </translations>
-  <release seq="1" allow_pseudo="false">
-    <messages fallback_to_english="true">
-      <!-- TODO add all of your "string table" messages here.  Remember to
-      change nontranslateable parts of the messages into placeholders (using the
-      <ph> element).  You can also use the 'grit add' tool to help you identify
-      nontranslateable parts and create placeholders for them. -->
-
-      <!-- Key names -->
-      <message name="IDS_ESC_KEY" desc="Escape key">
-        Esc
-      </message>
-      <message name="IDS_TAB_KEY" desc="Tab key">
-        Tab
-      </message>
-      <message name="IDS_INSERT_KEY" desc="Insert key">
-        Ins
-      </message>
-      <message name="IDS_HOME_KEY" desc="Home key">
-        Home
-      </message>
-      <message name="IDS_DELETE_KEY" desc="Delete key">
-        Del
-      </message>
-      <message name="IDS_END_KEY" desc="End key">
-        End
-      </message>
-      <message name="IDS_PAGEUP_KEY" desc="Page up key">
-        PgUp
-      </message>
-      <message name="IDS_PAGEDOWN_KEY" desc="Page down key">
-        PgDwn
-      </message>
-      <message name="IDS_LEFT_ARROW_KEY" desc="Left arrow key">
-        Left Arrow
-      </message>
-      <message name="IDS_RIGHT_ARROW_KEY" desc="Right arrow key">
-        Right Arrow
-      </message>
-      <message name="IDS_RIGHT_UP_KEY" desc="Up arrow key">
-        Up Arrow
-      </message>
-      <message name="IDS_RIGHT_DOWN_KEY" desc="Down arrow key">
-        Down Arrow
-      </message>
-      <message name="IDS_ENTER_KEY" desc="Enter key">
-        Enter
-      </message>
-      <message name="IDS_F1_KEY" desc="F1 key">
-        F1
-      </message>
-      <message name="IDS_F11_KEY" desc="F11 key">
-        F11
-      </message>
-
-      <!-- Shortcut Modifiers -->
-      <message name="IDS_CONTROL_MODIFIER" desc="Control key shortcut modifier">
-        Ctrl+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
-      </message>
-      <message name="IDS_ALT_MODIFIER" desc="Alt key shortcut modifier">
-        Alt+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
-      </message>
-      <message name="IDS_SHIFT_MODIFIER" desc="Shift key shortcut modifier">
-        Shift+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
-      </message>
-
-      <!-- Native Frame menu -->
-      <message name="IDS_ALWAYS_ON_TOP" desc="The optional menu in native frame windows for setting the window to be always on top">
-        Always on top
-      </message>
-      
-      <!-- Textfield context menu items -->
-      <message name="IDS_UNDO" desc="The text label of the Undo menu item">
-        &amp;Undo
-      </message>
-      <message name="IDS_CUT" desc="The text label of the Cut menu item">
-        Cu&amp;t
-      </message>
-      <message name="IDS_COPY" desc="The text label of the Copy menu item">
-        &amp;Copy
-      </message>
-      <message name="IDS_PASTE" desc="The text label of the Paste menu item">
-        &amp;Paste
-      </message>
-      <message name="IDS_SELECT_ALL" desc="The text label of the Select All menu item">
-        Select &amp;all
-      </message>
-      
-      <!-- Dialog button labels -->
-      <message name="IDS_OK" desc="Used for Ok on buttons">
-        OK
-      </message>
-      <message name="IDS_CANCEL" desc="Used for Cancel on buttons">
-        Cancel
-      </message>
-      <message name="IDS_CLOSE" desc="A generic term for Close on buttons and menus.">
-        Close
-      </message>
-
-      <!-- Scroll Bar Context Menu Labels -->
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLHERE" desc="The label for the 'Scroll Here' item">
-        Scroll to Here
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLLEFTEDGE" desc="The label for the 'Left Edge' item">
-        Left Edge
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE" desc="The label for the 'Right Edge' item">
-        Right Edge
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLHOME" desc="The label for the 'Top' item">
-        Top
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLEND" desc="The label for the 'Bottom' item">
-        Bottom
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLPAGEUP" desc="The label for the 'Page Up' item">
-        Page Up
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN" desc="The label for the 'Page Down' item">
-        Page Down
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLLEFT" desc="The label for the 'Scroll Left' item">
-        Scroll Left
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLRIGHT" desc="The label for the 'Scroll Left' item">
-        Scroll Right
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLUP" desc="The label for the 'Scroll Up' item">
-        Scroll Up
-      </message>
-      <message name="IDS_SCROLLBAR_CXMENU_SCROLLDOWN" desc="The label for the 'Scroll Down' item">
-        Scroll Down
-      </message>
-
-      <!-- Menus -->
-      <message name="IDS_MENU_EMPTY_SUBMENU" desc="Used when a submenu has no entries">
-        (empty)
-      </message>
-
-      <!-- Accessible name/action strings -->
-      <message name="IDS_ACCACTION_PRESS" desc="The accessible default action for a button.">
-        Press
-      </message>
-    </messages>
-  </release>
-</grit>
diff --git a/chrome/views/resources/views_strings.vcproj b/chrome/views/resources/views_strings.vcproj
deleted file mode 100644
index b31c53d..0000000
--- a/chrome/views/resources/views_strings.vcproj
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="views_strings"

-	ProjectGUID="{F0D8C703-8784-43A0-9EAD-2CF671F91C47}"

-	RootNamespace="views_strings"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-		<ToolFile

-			RelativePath="..\..\..\tools\grit\build\grit_localized_resources.rules"

-		/>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="GRIT Generated Resources"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="GRIT Generated Resources"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath=".\views_strings.grd"

-			>

-		</File>

-		<File

-			RelativePath="$(OutDir)\grit_derived_sources\grit\views_strings.h"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/chrome/views/window/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc
index da15a44..9c07817 100644
--- a/chrome/views/window/custom_frame_view.cc
+++ b/chrome/views/window/custom_frame_view.cc
@@ -12,7 +12,7 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/window_delegate.h"
-#include "grit/views_resources.h"
+#include "grit/theme_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/window/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc
index 525b989..f7fbcad 100644
--- a/chrome/views/window/dialog_client_view.cc
+++ b/chrome/views/window/dialog_client_view.cc
@@ -18,7 +18,7 @@
 #include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc
index 9ef7eea..8a53e2f 100644
--- a/chrome/views/window/window_win.cc
+++ b/chrome/views/window/window_win.cc
@@ -23,7 +23,7 @@
 #include "chrome/views/window/native_frame_view.h"
 #include "chrome/views/window/non_client_view.h"
 #include "chrome/views/window/window_delegate.h"
-#include "grit/views_strings.h"
+#include "grit/generated_resources.h"
 
 namespace {