summaryrefslogtreecommitdiffstats
path: root/views/controls/menu
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 19:36:24 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 19:36:24 +0000
commit61bd7d155e1ce5a3e14198b6170157faddf336e3 (patch)
treeb9ea0859298b2524293e59c28e6c0c6d169e1912 /views/controls/menu
parented1035a6e6db7cfe8578d1dbcf9567a114b5cb74 (diff)
downloadchromium_src-61bd7d155e1ce5a3e14198b6170157faddf336e3.zip
chromium_src-61bd7d155e1ce5a3e14198b6170157faddf336e3.tar.gz
chromium_src-61bd7d155e1ce5a3e14198b6170157faddf336e3.tar.bz2
revert this change, svn seems to have committed it with my property-edit.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu')
-rw-r--r--views/controls/menu/chrome_menu.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/menu/chrome_menu.cc b/views/controls/menu/chrome_menu.cc
index b05552f..6e5da26 100644
--- a/views/controls/menu/chrome_menu.cc
+++ b/views/controls/menu/chrome_menu.cc
@@ -19,7 +19,7 @@
#include "base/task.h"
#include "base/timer.h"
#include "base/win_util.h"
-#include "grit/app_strings.h"
+#include "grit/generated_resources.h"
#include "skia/ext/skia_utils_win.h"
#include "views/border.h"
#include "views/drag_utils.h"
@@ -788,7 +788,7 @@ class EmptyMenuMenuItem : public MenuItemView {
explicit EmptyMenuMenuItem(MenuItemView* parent) :
MenuItemView(parent, 0, NORMAL) {
- SetTitle(l10n_util::GetString(IDS_APP_MENU_EMPTY_SUBMENU));
+ SetTitle(l10n_util::GetString(IDS_MENU_EMPTY_SUBMENU));
// Set this so that we're not identified as a normal menu item.
SetID(kEmptyMenuItemViewID);
SetEnabled(false);