diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 19:30:56 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 19:30:56 +0000 |
| commit | ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74 (patch) | |
| tree | b639a27f7e168666b0bfe368ed9024b39b61dbfb /views/controls/scrollbar | |
| parent | be417138245009f5e42963374af6c4880192acb7 (diff) | |
| download | chromium_src-ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74.zip chromium_src-ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74.tar.gz chromium_src-ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74.tar.bz2 | |
Add generated files to svn:ignore list for views subdir.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/scrollbar')
| -rw-r--r-- | views/controls/scrollbar/bitmap_scroll_bar.cc | 28 |
1 files changed, 14 insertions, 14 deletions
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""; |