summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/chrome_menu.cc
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/menu/chrome_menu.cc
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/menu/chrome_menu.cc')
-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 6e5da26..b05552f 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/generated_resources.h"
+#include "grit/app_strings.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_MENU_EMPTY_SUBMENU));
+ SetTitle(l10n_util::GetString(IDS_APP_MENU_EMPTY_SUBMENU));
// Set this so that we're not identified as a normal menu item.
SetID(kEmptyMenuItemViewID);
SetEnabled(false);