summaryrefslogtreecommitdiffstats
path: root/views/controls/button
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 19:30:56 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 19:30:56 +0000
commited1035a6e6db7cfe8578d1dbcf9567a114b5cb74 (patch)
treeb639a27f7e168666b0bfe368ed9024b39b61dbfb /views/controls/button
parentbe417138245009f5e42963374af6c4880192acb7 (diff)
downloadchromium_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/button')
-rw-r--r--views/controls/button/button_dropdown.cc4
-rw-r--r--views/controls/button/menu_button.cc4
2 files changed, 4 insertions, 4 deletions
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;
}