Make views/ use strings from app_strings.

views/controls/scrollbar/bitmap_scroll_bar.cc

Index: views/controls/scrollbar/bitmap_scroll_bar.cc
===================================================================
--- views/controls/scrollbar/bitmap_scroll_bar.cc	(revision 16509)
+++ views/controls/scrollbar/bitmap_scroll_bar.cc	(working copy)
@@ -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 @@
 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"";