Make views/ use strings from app_strings.

views/accelerator.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/accelerator.h"
 
 #include <windows.h>
 
 #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 {
 
 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;
   }
 
   std::wstring shortcut;
   if (!string_id) {
     // Our fallback is to try translate the key code to a regular character
     // unless it is one of digits (VK_0 to VK_9). Some keyboard
     // layouts have characters other than digits assigned in
     // an unshifted mode (e.g. French AZERY layout has 'a with grave
     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
@@ skipping 16 matching lines @@
   bool adjust_shortcut_for_rtl = false;
   if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT &&
       shortcut.length() == 1 &&
       !IsAsciiAlpha(shortcut.at(0)) &&
       !IsAsciiDigit(shortcut.at(0))) {
     adjust_shortcut_for_rtl = true;
     shortcut_rtl.assign(shortcut);
   }
 
   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
   // therefore any text we draw for the menu items is drawn in an RTL context.
   // Thus, the text "Ctrl++" (which we currently use for the Zoom In option)
   // appears as "++Ctrl" in RTL because the Unicode BiDi algorithm puts
   // punctuations on the left when the context is right-to-left. Shortcuts that
   // do not end with a punctuation mark (such as "Ctrl+H" do not have this
   // problem).
   //
@@ skipping 15 matching lines @@
 
     // Subtracting the size of the shortcut key and 1 for the '+' sign.
     shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
     shortcut.swap(shortcut_rtl);
   }
 
   return shortcut;
 }
 
 }  // namespace views