Reverting 15180.

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

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

12 files changed, 99 insertions, 225 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 4981370..8baad6e 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3667,130 +3667,6 @@ each locale. -->
       <message name="IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL" desc="The label of the 'don't ask again' button on the default browser infobar.">
         Don't ask again
       </message>
-      
-      
-      <!-- The following strings need to move to a shared location. They are currently duplicated here with views_strings.grd only to make Mac/Linux compile -->
-      <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>
-      <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>
-      <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>
-      <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_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>
-      <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>
-      <message name="IDS_MENU_EMPTY_SUBMENU" desc="Used when a submenu has no entries">
-        (empty)
-      </message>
-      <message name="IDS_ACCACTION_PRESS" desc="The accessible default action for a button.">
-        Press
-      </message>
-      
 
     </messages>
   </release>
diff --git a/chrome/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc
index 9a466fb..a6f2f56 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/generated_resources.h"
+#include "grit/views_strings.h"
 
 // InfoBarDelegate: ------------------------------------------------------------
 
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 27698d0..30ab667 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -1297,8 +1297,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\vi
 		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
 		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-		{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}") = "v8_shell", "..\v8\tools\gyp\v8_shell.vcproj", "{31182CBE-9B7D-AAF2-65EE-F4D07012F4F3}"
diff --git a/chrome/views/accelerator.cc b/chrome/views/accelerator.cc
index e9ff76a..ef2dcd0 100644
--- a/chrome/views/accelerator.cc
+++ b/chrome/views/accelerator.cc
@@ -17,37 +17,37 @@ std::wstring Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
   case VK_TAB:
-    string_id = IDS_VIEWS_TAB_KEY;
+    string_id = IDS_TAB_KEY;
     break;
   case VK_RETURN:
-    string_id = IDS_VIEWS_ENTER_KEY;
+    string_id = IDS_ENTER_KEY;
     break;
   case VK_ESCAPE:
-    string_id = IDS_VIEWS_ESC_KEY;
+    string_id = IDS_ESC_KEY;
     break;
   case VK_PRIOR:
-    string_id = IDS_VIEWS_PAGEUP_KEY;
+    string_id = IDS_PAGEUP_KEY;
     break;
   case VK_NEXT:
-    string_id = IDS_VIEWS_PAGEDOWN_KEY;
+    string_id = IDS_PAGEDOWN_KEY;
     break;
   case VK_END:
-    string_id = IDS_VIEWS_END_KEY;
+    string_id = IDS_END_KEY;
     break;
   case VK_HOME:
-    string_id = IDS_VIEWS_HOME_KEY;
+    string_id = IDS_HOME_KEY;
     break;
   case VK_INSERT:
-    string_id = IDS_VIEWS_INSERT_KEY;
+    string_id = IDS_INSERT_KEY;
     break;
   case VK_DELETE:
-    string_id = IDS_VIEWS_DELETE_KEY;
+    string_id = IDS_DELETE_KEY;
     break;
   case VK_F1:
-    string_id = IDS_VIEWS_F1_KEY;
+    string_id = IDS_F1_KEY;
     break;
   case VK_F11:
-    string_id = IDS_VIEWS_F11_KEY;
+    string_id = IDS_F11_KEY;
     break;
   }
 
@@ -84,15 +84,15 @@ std::wstring Accelerator::GetShortcutText() const {
   }
 
   if (IsShiftDown())
-    shortcut = l10n_util::GetStringF(IDS_VIEWS_SHIFT_MODIFIER, shortcut);
+    shortcut = l10n_util::GetStringF(IDS_SHIFT_MODIFIER, shortcut);
 
   // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
   // See http://blogs.msdn.com/oldnewthing/archive/2004/03/29/101121.aspx for
   // more information.
   if (IsCtrlDown())
-    shortcut = l10n_util::GetStringF(IDS_VIEWS_CONTROL_MODIFIER, shortcut);
+    shortcut = l10n_util::GetStringF(IDS_CONTROL_MODIFIER, shortcut);
   else if (IsAltDown())
-    shortcut = l10n_util::GetStringF(IDS_VIEWS_ALT_MODIFIER, shortcut);
+    shortcut = l10n_util::GetStringF(IDS_ALT_MODIFIER, shortcut);
 
   // For some reason, menus in Windows ignore standard Unicode directionality
   // marks (such as LRE, PDF, etc.). On RTL locales, we use RTL menus and
diff --git a/chrome/views/controls/button/button_dropdown.cc b/chrome/views/controls/button/button_dropdown.cc
index ec41482..403bb78 100644
--- a/chrome/views/controls/button/button_dropdown.cc
+++ b/chrome/views/controls/button/button_dropdown.cc
@@ -171,7 +171,7 @@ void ButtonDropDown::ShowDropDownMenu(HWND window) {
 bool ButtonDropDown::GetAccessibleDefaultAction(std::wstring* action) {
   DCHECK(action);
 
-  action->assign(l10n_util::GetString(IDS_VIEWS_ACCACTION_PRESS));
+  action->assign(l10n_util::GetString(IDS_ACCACTION_PRESS));
   return true;
 }
 
diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc
index 4432d2d..e3a031a 100644
--- a/chrome/views/controls/button/menu_button.cc
+++ b/chrome/views/controls/button/menu_button.cc
@@ -232,7 +232,7 @@ void MenuButton::OnMouseExited(const MouseEvent& event) {
 bool MenuButton::GetAccessibleDefaultAction(std::wstring* action) {
   DCHECK(action);
 
-  action->assign(l10n_util::GetString(IDS_VIEWS_ACCACTION_PRESS));
+  action->assign(l10n_util::GetString(IDS_ACCACTION_PRESS));
   return true;
 }
 
diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc
index 2aa5b4b..dc0a24b 100644
--- a/chrome/views/controls/menu/chrome_menu.cc
+++ b/chrome/views/controls/menu/chrome_menu.cc
@@ -775,7 +775,7 @@ class EmptyMenuMenuItem : public MenuItemView {
   static const int kEmptyMenuItemViewID;
 
   EmptyMenuMenuItem(MenuItemView* parent) : MenuItemView(parent, 0, NORMAL) {
-    SetTitle(l10n_util::GetString(IDS_VIEWS_MENU_EMPTY_SUBMENU));
+    SetTitle(l10n_util::GetString(IDS_MENU_EMPTY_SUBMENU));
     // Set this so that we're not identified as a normal menu item.
     SetID(kEmptyMenuItemViewID);
     SetEnabled(false);
diff --git a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
index 624048b..4bd5d2d 100644
--- a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -557,31 +557,31 @@ void BitmapScrollBar::ShowContextMenu(View* source,
 std::wstring BitmapScrollBar::GetLabel(int id) const {
   switch (id) {
     case ScrollBarContextMenuCommand_ScrollHere:
-      return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLHERE);
+      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLHERE);
     case ScrollBarContextMenuCommand_ScrollStart:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLLEFTEDGE);
-      return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLHOME);
+        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLLEFTEDGE);
+      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLHOME);
     case ScrollBarContextMenuCommand_ScrollEnd:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE);
-      return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLEND);
+        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE);
+      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLEND);
     case ScrollBarContextMenuCommand_ScrollPageUp:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLPAGEUP);
-      return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLPAGEUP);
+        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLPAGEUP);
+      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLPAGEUP);
     case ScrollBarContextMenuCommand_ScrollPageDown:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
-      return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
+        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
+      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
     case ScrollBarContextMenuCommand_ScrollPrev:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLLEFT);
-      return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLUP);
+        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLLEFT);
+      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLUP);
     case ScrollBarContextMenuCommand_ScrollNext:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLRIGHT);
-      return l10n_util::GetString(IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLDOWN);
+        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLRIGHT);
+      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLDOWN);
   }
   NOTREACHED() << "Invalid BitmapScrollBar Context Menu command!";
   return L"";
diff --git a/chrome/views/controls/text_field.cc b/chrome/views/controls/text_field.cc
index 305bfd9..3d6bf55 100644
--- a/chrome/views/controls/text_field.cc
+++ b/chrome/views/controls/text_field.cc
@@ -290,18 +290,18 @@ TextField::Edit::Edit(TextField* parent, bool draw_border)
   text_object_model_ = ole_interface;
 
   context_menu_.reset(new Menu(this, Menu::TOPLEFT, m_hWnd));
-  context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_UNDO,
-                                         l10n_util::GetString(IDS_VIEWS_UNDO));
+  context_menu_->AppendMenuItemWithLabel(IDS_UNDO,
+                                         l10n_util::GetString(IDS_UNDO));
   context_menu_->AppendSeparator();
-  context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_CUT,
-                                         l10n_util::GetString(IDS_VIEWS_CUT));
-  context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_COPY,
-                                         l10n_util::GetString(IDS_VIEWS_COPY));
-  context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_PASTE,
-                                         l10n_util::GetString(IDS_VIEWS_PASTE));
+  context_menu_->AppendMenuItemWithLabel(IDS_CUT,
+                                         l10n_util::GetString(IDS_CUT));
+  context_menu_->AppendMenuItemWithLabel(IDS_COPY,
+                                         l10n_util::GetString(IDS_COPY));
+  context_menu_->AppendMenuItemWithLabel(IDS_PASTE,
+                                         l10n_util::GetString(IDS_PASTE));
   context_menu_->AppendSeparator();
-  context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_SELECT_ALL,
-                                         l10n_util::GetString(IDS_VIEWS_SELECT_ALL));
+  context_menu_->AppendMenuItemWithLabel(IDS_SELECT_ALL,
+                                         l10n_util::GetString(IDS_SELECT_ALL));
 }
 
 TextField::Edit::~Edit() {
@@ -377,14 +377,14 @@ void TextField::Edit::SetBackgroundColor(COLORREF bg_color) {
 
 bool TextField::Edit::IsCommandEnabled(int id) const {
   switch (id) {
-    case IDS_VIEWS_UNDO:       return !parent_->IsReadOnly() && !!CanUndo();
-    case IDS_VIEWS_CUT:        return !parent_->IsReadOnly() &&
-                                      !parent_->IsPassword() && !!CanCut();
-    case IDS_VIEWS_COPY:       return !!CanCopy() && !parent_->IsPassword();
-    case IDS_VIEWS_PASTE:      return !parent_->IsReadOnly() && !!CanPaste();
-    case IDS_VIEWS_SELECT_ALL: return !!CanSelectAll();
-    default:                   NOTREACHED();
-                               return false;
+    case IDS_UNDO:       return !parent_->IsReadOnly() && !!CanUndo();
+    case IDS_CUT:        return !parent_->IsReadOnly() &&
+                                !parent_->IsPassword() && !!CanCut();
+    case IDS_COPY:       return !!CanCopy() && !parent_->IsPassword();
+    case IDS_PASTE:      return !parent_->IsReadOnly() && !!CanPaste();
+    case IDS_SELECT_ALL: return !!CanSelectAll();
+    default:             NOTREACHED();
+                         return false;
   }
 }
 
@@ -392,12 +392,12 @@ void TextField::Edit::ExecuteCommand(int id) {
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
   switch (id) {
-    case IDS_VIEWS_UNDO:       Undo();       break;
-    case IDS_VIEWS_CUT:        Cut();        break;
-    case IDS_VIEWS_COPY:       Copy();       break;
-    case IDS_VIEWS_PASTE:      Paste();      break;
-    case IDS_VIEWS_SELECT_ALL: SelectAll();  break;
-    default:                   NOTREACHED(); break;
+    case IDS_UNDO:       Undo();       break;
+    case IDS_CUT:        Cut();        break;
+    case IDS_COPY:       Copy();       break;
+    case IDS_PASTE:      Paste();      break;
+    case IDS_SELECT_ALL: SelectAll();  break;
+    default:             NOTREACHED(); break;
   }
   OnAfterPossibleChange();
 }
diff --git a/chrome/views/resources/views_strings.grd b/chrome/views/resources/views_strings.grd
index 0180d3a..2e2896a 100644
--- a/chrome/views/resources/views_strings.grd
+++ b/chrome/views/resources/views_strings.grd
@@ -183,138 +183,138 @@ need to be translated for each locale.-->
       nontranslateable parts and create placeholders for them. -->
 
       <!-- Key names -->
-      <message name="IDS_VIEWS_ESC_KEY" desc="Escape key">
+      <message name="IDS_ESC_KEY" desc="Escape key">
         Esc
       </message>
-      <message name="IDS_VIEWS_TAB_KEY" desc="Tab key">
+      <message name="IDS_TAB_KEY" desc="Tab key">
         Tab
       </message>
-      <message name="IDS_VIEWS_INSERT_KEY" desc="Insert key">
+      <message name="IDS_INSERT_KEY" desc="Insert key">
         Ins
       </message>
-      <message name="IDS_VIEWS_HOME_KEY" desc="Home key">
+      <message name="IDS_HOME_KEY" desc="Home key">
         Home
       </message>
-      <message name="IDS_VIEWS_DELETE_KEY" desc="Delete key">
+      <message name="IDS_DELETE_KEY" desc="Delete key">
         Del
       </message>
-      <message name="IDS_VIEWS_END_KEY" desc="End key">
+      <message name="IDS_END_KEY" desc="End key">
         End
       </message>
-      <message name="IDS_VIEWS_PAGEUP_KEY" desc="Page up key">
+      <message name="IDS_PAGEUP_KEY" desc="Page up key">
         PgUp
       </message>
-      <message name="IDS_VIEWS_PAGEDOWN_KEY" desc="Page down key">
+      <message name="IDS_PAGEDOWN_KEY" desc="Page down key">
         PgDwn
       </message>
-      <message name="IDS_VIEWS_LEFT_ARROW_KEY" desc="Left arrow key">
+      <message name="IDS_LEFT_ARROW_KEY" desc="Left arrow key">
         Left Arrow
       </message>
-      <message name="IDS_VIEWS_RIGHT_ARROW_KEY" desc="Right arrow key">
+      <message name="IDS_RIGHT_ARROW_KEY" desc="Right arrow key">
         Right Arrow
       </message>
-      <message name="IDS_VIEWS_RIGHT_UP_KEY" desc="Up arrow key">
+      <message name="IDS_RIGHT_UP_KEY" desc="Up arrow key">
         Up Arrow
       </message>
-      <message name="IDS_VIEWS_RIGHT_DOWN_KEY" desc="Down arrow key">
+      <message name="IDS_RIGHT_DOWN_KEY" desc="Down arrow key">
         Down Arrow
       </message>
-      <message name="IDS_VIEWS_ENTER_KEY" desc="Enter key">
+      <message name="IDS_ENTER_KEY" desc="Enter key">
         Enter
       </message>
-      <message name="IDS_VIEWS_F1_KEY" desc="F1 key">
+      <message name="IDS_F1_KEY" desc="F1 key">
         F1
       </message>
-      <message name="IDS_VIEWS_F11_KEY" desc="F11 key">
+      <message name="IDS_F11_KEY" desc="F11 key">
         F11
       </message>
 
       <!-- Shortcut Modifiers -->
-      <message name="IDS_VIEWS_CONTROL_MODIFIER" desc="Control key shortcut modifier">
+      <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_VIEWS_ALT_MODIFIER" desc="Alt key shortcut modifier">
+      <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_VIEWS_SHIFT_MODIFIER" desc="Shift key shortcut modifier">
+      <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_VIEWS_ALWAYS_ON_TOP" desc="The optional menu in native frame windows for setting the window to be always on top">
+      <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_VIEWS_UNDO" desc="The text label of the Undo menu item">
+      <message name="IDS_UNDO" desc="The text label of the Undo menu item">
         &amp;Undo
       </message>
-      <message name="IDS_VIEWS_CUT" desc="The text label of the Cut menu item">
+      <message name="IDS_CUT" desc="The text label of the Cut menu item">
         Cu&amp;t
       </message>
-      <message name="IDS_VIEWS_COPY" desc="The text label of the Copy menu item">
+      <message name="IDS_COPY" desc="The text label of the Copy menu item">
         &amp;Copy
       </message>
-      <message name="IDS_VIEWS_PASTE" desc="The text label of the Paste menu item">
+      <message name="IDS_PASTE" desc="The text label of the Paste menu item">
         &amp;Paste
       </message>
-      <message name="IDS_VIEWS_SELECT_ALL" desc="The text label of the Select All menu item">
+      <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_VIEWS_OK" desc="Used for Ok on buttons">
+      <message name="IDS_OK" desc="Used for Ok on buttons">
         OK
       </message>
-      <message name="IDS_VIEWS_CANCEL" desc="Used for Cancel on buttons">
+      <message name="IDS_CANCEL" desc="Used for Cancel on buttons">
         Cancel
       </message>
-      <message name="IDS_VIEWS_CLOSE" desc="A generic term for Close on buttons and menus.">
+      <message name="IDS_CLOSE" desc="A generic term for Close on buttons and menus.">
         Close
       </message>
 
       <!-- Scroll Bar Context Menu Labels -->
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLHERE" desc="The label for the 'Scroll Here' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLHERE" desc="The label for the 'Scroll Here' item">
         Scroll to Here
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLLEFTEDGE" desc="The label for the 'Left Edge' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLLEFTEDGE" desc="The label for the 'Left Edge' item">
         Left Edge
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE" desc="The label for the 'Right Edge' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE" desc="The label for the 'Right Edge' item">
         Right Edge
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLHOME" desc="The label for the 'Top' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLHOME" desc="The label for the 'Top' item">
         Top
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLEND" desc="The label for the 'Bottom' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLEND" desc="The label for the 'Bottom' item">
         Bottom
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLPAGEUP" desc="The label for the 'Page Up' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLPAGEUP" desc="The label for the 'Page Up' item">
         Page Up
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN" desc="The label for the 'Page Down' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN" desc="The label for the 'Page Down' item">
         Page Down
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLLEFT" desc="The label for the 'Scroll Left' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLLEFT" desc="The label for the 'Scroll Left' item">
         Scroll Left
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLRIGHT" desc="The label for the 'Scroll Left' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLRIGHT" desc="The label for the 'Scroll Left' item">
         Scroll Right
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLUP" desc="The label for the 'Scroll Up' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLUP" desc="The label for the 'Scroll Up' item">
         Scroll Up
       </message>
-      <message name="IDS_VIEWS_SCROLLBAR_CXMENU_SCROLLDOWN" desc="The label for the 'Scroll Down' item">
+      <message name="IDS_SCROLLBAR_CXMENU_SCROLLDOWN" desc="The label for the 'Scroll Down' item">
         Scroll Down
       </message>
 
       <!-- Menus -->
-      <message name="IDS_VIEWS_MENU_EMPTY_SUBMENU" desc="Used when a submenu has no entries">
+      <message name="IDS_MENU_EMPTY_SUBMENU" desc="Used when a submenu has no entries">
         (empty)
       </message>
 
       <!-- Accessible name/action strings -->
-      <message name="IDS_VIEWS_ACCACTION_PRESS" desc="The accessible default action for a button.">
+      <message name="IDS_ACCACTION_PRESS" desc="The accessible default action for a button.">
         Press
       </message>
     </messages>
diff --git a/chrome/views/window/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc
index 74e6741..525b989 100644
--- a/chrome/views/window/dialog_client_view.cc
+++ b/chrome/views/window/dialog_client_view.cc
@@ -110,7 +110,7 @@ void DialogClientView::ShowDialogButtons() {
     std::wstring label =
         dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_OK);
     if (label.empty())
-      label = l10n_util::GetString(IDS_VIEWS_OK);
+      label = l10n_util::GetString(IDS_OK);
     bool is_default_button =
         (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_OK) != 0;
     ok_button_ = new DialogButton(this, window(),
@@ -128,9 +128,9 @@ void DialogClientView::ShowDialogButtons() {
         dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_CANCEL);
     if (label.empty()) {
       if (buttons & MessageBoxFlags::DIALOGBUTTON_OK) {
-        label = l10n_util::GetString(IDS_VIEWS_CANCEL);
+        label = l10n_util::GetString(IDS_CANCEL);
       } else {
-        label = l10n_util::GetString(IDS_VIEWS_CLOSE);
+        label = l10n_util::GetString(IDS_CLOSE);
       }
     }
     bool is_default_button =
diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc
index 29a891b..9ef7eea 100644
--- a/chrome/views/window/window_win.cc
+++ b/chrome/views/window/window_win.cc
@@ -1270,7 +1270,7 @@ void WindowWin::InitAlwaysOnTopState() {
 
 void WindowWin::AddAlwaysOnTopSystemMenuItem() {
   // The Win32 API requires that we own the text.
-  always_on_top_menu_text_ = l10n_util::GetString(IDS_VIEWS_ALWAYS_ON_TOP);
+  always_on_top_menu_text_ = l10n_util::GetString(IDS_ALWAYS_ON_TOP);
 
   // Let's insert a menu to the window.
   HMENU system_menu = ::GetSystemMenu(GetNativeView(), FALSE);