summaryrefslogtreecommitdiffstats
path: root/chrome/views/controls/button
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-04 01:59:52 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-04 01:59:52 +0000
commitdacf60b7306604fc2cb6409cf2e1cc5d651a16a6 (patch)
treed1c50e8cd78a1a3e9660f965b9a169474823a55f /chrome/views/controls/button
parentfa74057d3ab2fdcff11000ff2fce5acc2c763161 (diff)
downloadchromium_src-dacf60b7306604fc2cb6409cf2e1cc5d651a16a6.zip
chromium_src-dacf60b7306604fc2cb6409cf2e1cc5d651a16a6.tar.gz
chromium_src-dacf60b7306604fc2cb6409cf2e1cc5d651a16a6.tar.bz2
Bustage fix for mac and linux:
Duplicate views strings and rename them to uniquify them to get mac and linux going again. TODO(beng): move these strings into the forthcoming app/ dependency so that mac linux and windows can rely on it. Review URL: http://codereview.chromium.org/99335 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/controls/button')
-rw-r--r--chrome/views/controls/button/button_dropdown.cc2
-rw-r--r--chrome/views/controls/button/menu_button.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/views/controls/button/button_dropdown.cc b/chrome/views/controls/button/button_dropdown.cc
index 403bb78..ec41482 100644
--- a/chrome/views/controls/button/button_dropdown.cc
+++ b/chrome/views/controls/button/button_dropdown.cc
@@ -171,7 +171,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_VIEWS_ACCACTION_PRESS));
return true;
}
diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc
index e3a031a..4432d2d 100644
--- a/chrome/views/controls/button/menu_button.cc
+++ b/chrome/views/controls/button/menu_button.cc
@@ -232,7 +232,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_VIEWS_ACCACTION_PRESS));
return true;
}