Make views/ use strings from app_strings.

http://crbug.com/11387

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

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

13 files changed, 69 insertions, 196 deletions

diff --git a/app/resources/app_strings.grd b/app/resources/app_strings.grd
index 8cbd24d..96fb59f 100644
--- a/app/resources/app_strings.grd
+++ b/app/resources/app_strings.grd
@@ -175,7 +175,7 @@ need to be translated for each locale.-->
     -->
   </translations>
   <release seq="1" allow_pseudo="false">
-    <messages fallback_to_english="true" first_id="30000">
+    <messages fallback_to_english="true">
     
       <!-- Menus -->
       <message name="IDS_APP_MENU_EMPTY_SUBMENU" desc="Used when a submenu has no entries">
@@ -189,133 +189,7 @@ need to be translated for each locale.-->
       <message name="IDS_APP_SAVEAS_ALL_FILES" desc="Save As dialog box default text">
         All Files
       </message>
-
-      <!--Accessible name/action strings-->
-      <message name="IDS_APP_ACCACTION_PRESS" desc="The accessible default action for a button.">
-        Press
-      </message>
-
-      <!-- Scroll Bar Context Menu Labels -->
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE" desc="The label for the 'Scroll Here' item">
-        Scroll to Here
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE" desc="The label for the 'Left Edge' item">
-        Left Edge
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE" desc="The label for the 'Right Edge' item">
-        Right Edge
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME" desc="The label for the 'Top' item">
-        Top
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLEND" desc="The label for the 'Bottom' item">
-        Bottom
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP" desc="The label for the 'Page Up' item">
-        Page Up
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN" desc="The label for the 'Page Down' item">
-        Page Down
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT" desc="The label for the 'Scroll Left' item">
-        Scroll Left
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT" desc="The label for the 'Scroll Left' item">
-        Scroll Right
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLUP" desc="The label for the 'Scroll Up' item">
-        Scroll Up
-      </message>
-      <message name="IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN" desc="The label for the 'Scroll Down' item">
-        Scroll Down
-      </message>
-
-      <!-- Edit field context menu item labels. -->
-      <message name="IDS_APP_UNDO" desc="The text label of the Undo menu item">
-        &amp;Undo
-      </message>
-      <message name="IDS_APP_CUT" desc="The text label of the Cut menu item">
-        Cu&amp;t
-      </message>
-      <message name="IDS_APP_COPY" desc="The text label of the Copy menu item">
-        &amp;Copy
-      </message>
-      <message name="IDS_APP_PASTE" desc="The text label of the Paste menu item">
-        &amp;Paste
-      </message>
-      <message name="IDS_APP_SELECT_ALL" desc="The text label of the Select All menu item">
-        Select &amp;all
-      </message>
-
-      <!-- Generic terms -->
-      <message name="IDS_APP_OK" desc="Used for Ok on buttons">
-        OK
-      </message>
-      <message name="IDS_APP_CANCEL" desc="Used for Cancel on buttons">
-        Cancel
-      </message>
-      <message name="IDS_APP_CLOSE" desc="A generic term for Close on buttons and menus.">
-        Close
-      </message>
-
-      <!-- Key names -->
-      <message name="IDS_APP_ESC_KEY" desc="Escape key">
-        Esc
-      </message>
-      <message name="IDS_APP_TAB_KEY" desc="Tab key">
-        Tab
-      </message>
-      <message name="IDS_APP_INSERT_KEY" desc="Insert key">
-        Ins
-      </message>
-      <message name="IDS_APP_HOME_KEY" desc="Home key">
-        Home
-      </message>
-      <message name="IDS_APP_DELETE_KEY" desc="Delete key">
-        Del
-      </message>
-      <message name="IDS_APP_END_KEY" desc="End key">
-        End
-      </message>
-      <message name="IDS_APP_PAGEUP_KEY" desc="Page up key">
-        PgUp
-      </message>
-      <message name="IDS_APP_PAGEDOWN_KEY" desc="Page down key">
-        PgDwn
-      </message>
-      <message name="IDS_APP_LEFT_ARROW_KEY" desc="Left arrow key">
-        Left Arrow
-      </message>
-      <message name="IDS_APP_RIGHT_ARROW_KEY" desc="Right arrow key">
-        Right Arrow
-      </message>
-      <message name="IDS_APP_RIGHT_UP_KEY" desc="Up arrow key">
-        Up Arrow
-      </message>
-      <message name="IDS_APP_RIGHT_DOWN_KEY" desc="Down arrow key">
-        Down Arrow
-      </message>
-      <message name="IDS_APP_ENTER_KEY" desc="Enter key">
-        Enter
-      </message>
-      <message name="IDS_APP_F1_KEY" desc="F1 key">
-        F1
-      </message>
-      <message name="IDS_APP_F11_KEY" desc="F11 key">
-        F11
-      </message>
-
-      <!-- Shortcut Modifiers -->
-      <message name="IDS_APP_CONTROL_MODIFIER" desc="Control key shortcut modifier">
-        Ctrl+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
-      </message>
-      <message name="IDS_APP_ALT_MODIFIER" desc="Alt key shortcut modifier">
-        Alt+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
-      </message>
-      <message name="IDS_APP_SHIFT_MODIFIER" desc="Shift key shortcut modifier">
-        Shift+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
-      </message>
-      
+    
     </messages>
   </release>
 </grit>
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 12e1649..88871e9 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -1584,8 +1584,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtestmain", "..\testing\gte
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "..\views\views.vcproj", "{6F9258E5-294F-47B2-919D-17FFE7A8B751}"
 	ProjectSection(ProjectDependencies) = postProject
-		{AE9BF4A2-19C5-49D8-BB1A-F28496DD7051} = {AE9BF4A2-19C5-49D8-BB1A-F28496DD7051}
 		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inspector_resources", "..\webkit\inspector_resources.vcproj", "{5330F8EE-00F5-D65C-166E-E3150171055D}"
diff --git a/views/accelerator.cc b/views/accelerator.cc
index b9a474a..af969ac 100644
--- a/views/accelerator.cc
+++ b/views/accelerator.cc
@@ -9,7 +9,7 @@
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "grit/generated_resources.h"
+#include "grit/app_strings.h"
 
 namespace views {
 
@@ -17,37 +17,37 @@ std::wstring Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
   case VK_TAB:
-    string_id = IDS_TAB_KEY;
+    string_id = IDS_APP_TAB_KEY;
     break;
   case VK_RETURN:
-    string_id = IDS_ENTER_KEY;
+    string_id = IDS_APP_ENTER_KEY;
     break;
   case VK_ESCAPE:
-    string_id = IDS_ESC_KEY;
+    string_id = IDS_APP_ESC_KEY;
     break;
   case VK_PRIOR:
-    string_id = IDS_PAGEUP_KEY;
+    string_id = IDS_APP_PAGEUP_KEY;
     break;
   case VK_NEXT:
-    string_id = IDS_PAGEDOWN_KEY;
+    string_id = IDS_APP_PAGEDOWN_KEY;
     break;
   case VK_END:
-    string_id = IDS_END_KEY;
+    string_id = IDS_APP_END_KEY;
     break;
   case VK_HOME:
-    string_id = IDS_HOME_KEY;
+    string_id = IDS_APP_HOME_KEY;
     break;
   case VK_INSERT:
-    string_id = IDS_INSERT_KEY;
+    string_id = IDS_APP_INSERT_KEY;
     break;
   case VK_DELETE:
-    string_id = IDS_DELETE_KEY;
+    string_id = IDS_APP_DELETE_KEY;
     break;
   case VK_F1:
-    string_id = IDS_F1_KEY;
+    string_id = IDS_APP_F1_KEY;
     break;
   case VK_F11:
-    string_id = IDS_F11_KEY;
+    string_id = IDS_APP_F11_KEY;
     break;
   }
 
@@ -84,15 +84,15 @@ std::wstring Accelerator::GetShortcutText() const {
   }
 
   if (IsShiftDown())
-    shortcut = l10n_util::GetStringF(IDS_SHIFT_MODIFIER, shortcut);
+    shortcut = l10n_util::GetStringF(IDS_APP_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_CONTROL_MODIFIER, shortcut);
+    shortcut = l10n_util::GetStringF(IDS_APP_CONTROL_MODIFIER, shortcut);
   else if (IsAltDown())
-    shortcut = l10n_util::GetStringF(IDS_ALT_MODIFIER, shortcut);
+    shortcut = l10n_util::GetStringF(IDS_APP_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/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index 6c81c24..cb1f6ec 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -7,7 +7,7 @@
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
-#include "grit/generated_resources.h"
+#include "grit/app_strings.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/widget/widget.h"
 
@@ -172,7 +172,7 @@ void ButtonDropDown::ShowDropDownMenu(HWND window) {
 bool ButtonDropDown::GetAccessibleDefaultAction(std::wstring* action) {
   DCHECK(action);
 
-  action->assign(l10n_util::GetString(IDS_ACCACTION_PRESS));
+  action->assign(l10n_util::GetString(IDS_APP_ACCACTION_PRESS));
   return true;
 }
 
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 28045a4..fdb28c0 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -9,7 +9,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
-#include "grit/generated_resources.h"
+#include "grit/app_strings.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
@@ -231,7 +231,7 @@ void MenuButton::OnMouseExited(const MouseEvent& event) {
 bool MenuButton::GetAccessibleDefaultAction(std::wstring* action) {
   DCHECK(action);
 
-  action->assign(l10n_util::GetString(IDS_ACCACTION_PRESS));
+  action->assign(l10n_util::GetString(IDS_APP_ACCACTION_PRESS));
   return true;
 }
 
diff --git a/views/controls/menu/chrome_menu.cc b/views/controls/menu/chrome_menu.cc
index 6e5da26..b05552f 100644
--- a/views/controls/menu/chrome_menu.cc
+++ b/views/controls/menu/chrome_menu.cc
@@ -19,7 +19,7 @@
 #include "base/task.h"
 #include "base/timer.h"
 #include "base/win_util.h"
-#include "grit/generated_resources.h"
+#include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/border.h"
 #include "views/drag_utils.h"
@@ -788,7 +788,7 @@ class EmptyMenuMenuItem : public MenuItemView {
 
   explicit EmptyMenuMenuItem(MenuItemView* parent) :
       MenuItemView(parent, 0, NORMAL) {
-    SetTitle(l10n_util::GetString(IDS_MENU_EMPTY_SUBMENU));
+    SetTitle(l10n_util::GetString(IDS_APP_MENU_EMPTY_SUBMENU));
     // Set this so that we're not identified as a normal menu item.
     SetID(kEmptyMenuItemViewID);
     SetEnabled(false);
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index 2ac20af..1d00158 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -10,7 +10,6 @@
 #include "base/message_loop.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
-#include "grit/generated_resources.h"
 #include "views/controls/button/checkbox.h"
 #include "views/standard_layout.h"
 #include "views/views_delegate.h"
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index 2d0fbdf..7770768 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -8,7 +8,7 @@
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
-#include "grit/generated_resources.h"
+#include "grit/app_strings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/scroll_view.h"
@@ -561,31 +561,31 @@ void BitmapScrollBar::ShowContextMenu(View* source,
 std::wstring BitmapScrollBar::GetLabel(int id) const {
   switch (id) {
     case ScrollBarContextMenuCommand_ScrollHere:
-      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLHERE);
+      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE);
     case ScrollBarContextMenuCommand_ScrollStart:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLLEFTEDGE);
-      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLHOME);
+        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE);
+      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME);
     case ScrollBarContextMenuCommand_ScrollEnd:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE);
-      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLEND);
+        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE);
+      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLEND);
     case ScrollBarContextMenuCommand_ScrollPageUp:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLPAGEUP);
-      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLPAGEUP);
+        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP);
+      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP);
     case ScrollBarContextMenuCommand_ScrollPageDown:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
-      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
+        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
+      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN);
     case ScrollBarContextMenuCommand_ScrollPrev:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLLEFT);
-      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLUP);
+        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT);
+      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLUP);
     case ScrollBarContextMenuCommand_ScrollNext:
       if (IsHorizontal())
-        return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLRIGHT);
-      return l10n_util::GetString(IDS_SCROLLBAR_CXMENU_SCROLLDOWN);
+        return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT);
+      return l10n_util::GetString(IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN);
   }
   NOTREACHED() << "Invalid BitmapScrollBar Context Menu command!";
   return L"";
diff --git a/views/controls/text_field.cc b/views/controls/text_field.cc
index 2a608bb..759fb37 100644
--- a/views/controls/text_field.cc
+++ b/views/controls/text_field.cc
@@ -21,7 +21,7 @@
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "grit/generated_resources.h"
+#include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/hwnd_view.h"
 #include "views/controls/menu/menu_win.h"
@@ -286,18 +286,18 @@ TextField::Edit::Edit(TextField* parent, bool draw_border)
   text_object_model_ = ole_interface;
 
   context_menu_.reset(new MenuWin(this, Menu::TOPLEFT, m_hWnd));
-  context_menu_->AppendMenuItemWithLabel(IDS_UNDO,
-                                         l10n_util::GetString(IDS_UNDO));
+  context_menu_->AppendMenuItemWithLabel(IDS_APP_UNDO,
+                                         l10n_util::GetString(IDS_APP_UNDO));
   context_menu_->AppendSeparator();
-  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_->AppendMenuItemWithLabel(IDS_APP_CUT,
+                                         l10n_util::GetString(IDS_APP_CUT));
+  context_menu_->AppendMenuItemWithLabel(IDS_APP_COPY,
+                                         l10n_util::GetString(IDS_APP_COPY));
+  context_menu_->AppendMenuItemWithLabel(IDS_APP_PASTE,
+                                         l10n_util::GetString(IDS_APP_PASTE));
   context_menu_->AppendSeparator();
-  context_menu_->AppendMenuItemWithLabel(IDS_SELECT_ALL,
-                                         l10n_util::GetString(IDS_SELECT_ALL));
+  context_menu_->AppendMenuItemWithLabel(IDS_APP_SELECT_ALL,
+                                         l10n_util::GetString(IDS_APP_SELECT_ALL));
 }
 
 TextField::Edit::~Edit() {
@@ -373,14 +373,14 @@ void TextField::Edit::SetBackgroundColor(COLORREF bg_color) {
 
 bool TextField::Edit::IsCommandEnabled(int id) const {
   switch (id) {
-    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;
+    case IDS_APP_UNDO:       return !parent_->IsReadOnly() && !!CanUndo();
+    case IDS_APP_CUT:        return !parent_->IsReadOnly() &&
+                                 !parent_->IsPassword() && !!CanCut();
+    case IDS_APP_COPY:       return !!CanCopy() && !parent_->IsPassword();
+    case IDS_APP_PASTE:      return !parent_->IsReadOnly() && !!CanPaste();
+    case IDS_APP_SELECT_ALL: return !!CanSelectAll();
+    default:                 NOTREACHED();
+                             return false;
   }
 }
 
@@ -388,12 +388,12 @@ void TextField::Edit::ExecuteCommand(int id) {
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
   switch (id) {
-    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;
+    case IDS_APP_UNDO:       Undo();       break;
+    case IDS_APP_CUT:        Cut();        break;
+    case IDS_APP_COPY:       Copy();       break;
+    case IDS_APP_PASTE:      Paste();      break;
+    case IDS_APP_SELECT_ALL: SelectAll();  break;
+    default:                 NOTREACHED(); break;
   }
   OnAfterPossibleChange();
 }
diff --git a/views/views.gyp b/views/views.gyp
index fa36e1e..d65a102 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -43,6 +43,7 @@
       'msvs_guid': '6F9258E5-294F-47B2-919D-17FFE7A8B751',
       'dependencies': [
         '../app/app.gyp:app_base',      
+        '../app/app.gyp:app_strings',      
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
         '../third_party/icu38/icu38.gyp:icuuc',
diff --git a/views/views.vsprops b/views/views.vsprops
index 72a6e0d..74cf461 100644
--- a/views/views.vsprops
+++ b/views/views.vsprops
@@ -7,6 +7,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\;&quot;$(IntDir)\..\generated_resources\&quot;"
+		AdditionalIncludeDirectories="..;&quot;$(IntDir)\..\global_intermediate\app&quot;"
 	/>
 </VisualStudioPropertySheet>
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 5a36830..9650f26 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -13,7 +13,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
-#include "grit/generated_resources.h"
+#include "grit/app_strings.h"
 #include "views/controls/button/native_button.h"
 #include "views/standard_layout.h"
 #include "views/window/dialog_delegate.h"
@@ -109,7 +109,7 @@ void DialogClientView::ShowDialogButtons() {
     std::wstring label =
         dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_OK);
     if (label.empty())
-      label = l10n_util::GetString(IDS_OK);
+      label = l10n_util::GetString(IDS_APP_OK);
     bool is_default_button =
         (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_OK) != 0;
     ok_button_ = new DialogButton(this, window(),
@@ -127,9 +127,9 @@ void DialogClientView::ShowDialogButtons() {
         dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_CANCEL);
     if (label.empty()) {
       if (buttons & MessageBoxFlags::DIALOGBUTTON_OK) {
-        label = l10n_util::GetString(IDS_CANCEL);
+        label = l10n_util::GetString(IDS_APP_CANCEL);
       } else {
-        label = l10n_util::GetString(IDS_CLOSE);
+        label = l10n_util::GetString(IDS_APP_CLOSE);
       }
     }
     bool is_default_button =
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 2286762..2ba4797 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -14,7 +14,6 @@
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
 #include "base/win_util.h"
-#include "grit/generated_resources.h"
 #include "views/widget/root_view.h"
 #include "views/window/client_view.h"
 #include "views/window/custom_frame_view.h"