Make views/ use strings from app_strings.

views/controls/scrollbar/bitmap_scroll_bar.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/controls/scrollbar/bitmap_scroll_bar.h"
 
 #include "app/gfx/canvas.h"
 #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"
 #include "views/widget/widget.h"
 
 #undef min
 #undef max
 
 namespace views {
 
@@ skipping 532 matching lines @@
   menu->AppendDelegateMenuItem(ScrollBarContextMenuCommand_ScrollNext);
   menu->RunMenuAt(x, y);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BitmapScrollBar, Menu::Delegate implementation:
 
 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"";
 }
 
 bool BitmapScrollBar::IsCommandEnabled(int id) const {
   switch (id) {
     case ScrollBarContextMenuCommand_ScrollPageUp:
     case ScrollBarContextMenuCommand_ScrollPageDown:
       return !IsHorizontal();
@@ skipping 99 matching lines @@
     thumb_position = thumb_position - (thumb_->GetSize() / 2);
   return (thumb_position * contents_size_) / GetTrackSize();
 }
 
 void BitmapScrollBar::SetThumbTrackState(CustomButton::ButtonState state) {
   thumb_track_state_ = state;
   SchedulePaint();
 }
 
 }  // namespace views