linux: Stock menu icons update.

Show default stock icons for the bookmark bar context menus, and use gtk-save-as icon instead gtk-save for the 'Save ..  As ...' items.

Also, use IDC_ values instead of IDS_ values for the bookmark-bar context menus.

BUG=65441
TEST=manual, see bug.

Review URL: http://codereview.chromium.org/5659003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68690 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 121 insertions, 109 deletions

diff --git a/chrome/browser/ui/views/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmark_bar_view_test.cc
index 44431f8..d98c20f 100644
--- a/chrome/browser/ui/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmark_bar_view_test.cc
@@ -5,6 +5,7 @@
 #include "app/keyboard_codes.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -1291,7 +1292,7 @@ class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* delete_menu =
-        menu->GetMenuItemByID(IDS_BOOKMARK_BAR_REMOVE);
+        menu->GetMenuItemByID(IDC_BOOKMARK_BAR_REMOVE);
     ASSERT_TRUE(delete_menu);
 
     // Click on the delete button.
diff --git a/chrome/browser/ui/views/bookmark_context_menu.cc b/chrome/browser/ui/views/bookmark_context_menu.cc
index b65d16c..bd435ae 100644
--- a/chrome/browser/ui/views/bookmark_context_menu.cc
+++ b/chrome/browser/ui/views/bookmark_context_menu.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
+#include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
@@ -60,7 +61,7 @@ bool BookmarkContextMenu::IsCommandEnabled(int command_id) const {
 }
 
 bool BookmarkContextMenu::ShouldCloseAllMenusOnExecute(int id) {
-  return id != IDS_BOOKMARK_BAR_REMOVE;
+  return id != IDC_BOOKMARK_BAR_REMOVE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -71,10 +72,6 @@ void BookmarkContextMenu::CloseMenu() {
   menu_->Cancel();
 }
 
-void BookmarkContextMenu::AddItem(int command_id) {
-  menu_->AppendMenuItemWithLabel(command_id, l10n_util::GetString(command_id));
-}
-
 void BookmarkContextMenu::AddItemWithStringId(int command_id, int string_id) {
   menu_->AppendMenuItemWithLabel(command_id, l10n_util::GetString(string_id));
 }
@@ -83,8 +80,8 @@ void BookmarkContextMenu::AddSeparator() {
   menu_->AppendSeparator();
 }
 
-void BookmarkContextMenu::AddCheckboxItem(int command_id) {
-  menu_->AppendMenuItem(command_id, l10n_util::GetString(command_id),
+void BookmarkContextMenu::AddCheckboxItem(int command_id, int string_id) {
+  menu_->AppendMenuItem(command_id, l10n_util::GetString(string_id),
                         views::MenuItemView::CHECKBOX);
 }
 
diff --git a/chrome/browser/ui/views/bookmark_context_menu.h b/chrome/browser/ui/views/bookmark_context_menu.h
index 1c7bf3c..c6cd19d 100644
--- a/chrome/browser/ui/views/bookmark_context_menu.h
+++ b/chrome/browser/ui/views/bookmark_context_menu.h
@@ -51,10 +51,9 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerViewsDelegate,
 
   // Overridden from BookmarkContextMenuControllerViewsDelegate:
   virtual void CloseMenu();
-  virtual void AddItem(int command_id);
   virtual void AddItemWithStringId(int command_id, int string_id);
   virtual void AddSeparator();
-  virtual void AddCheckboxItem(int command_id);
+  virtual void AddCheckboxItem(int command_id, int string_id);
   virtual void WillRemoveBookmarks(
       const std::vector<const BookmarkNode*>& bookmarks);
   virtual void DidRemoveBookmarks();
diff --git a/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc
index 54282d1..b2f7c29 100644
--- a/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/views/bookmark_context_menu_controller_views.h"
 
 #include "base/compiler_specific.h"
+#include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -44,56 +45,65 @@ BookmarkContextMenuControllerViews::~BookmarkContextMenuControllerViews() {
 
 void BookmarkContextMenuControllerViews::BuildMenu() {
   if (selection_.size() == 1 && selection_[0]->is_url()) {
-    delegate_->AddItemWithStringId(IDS_BOOMARK_BAR_OPEN_ALL,
+    delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL,
                                    IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB);
-    delegate_->AddItemWithStringId(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW,
+    delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
                                    IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW);
-    delegate_->AddItemWithStringId(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO,
+    delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
                                    IDS_BOOMARK_BAR_OPEN_INCOGNITO);
   } else {
-    delegate_->AddItem(IDS_BOOMARK_BAR_OPEN_ALL);
-    delegate_->AddItem(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW);
-    delegate_->AddItem(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO);
+    delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL,
+                                   IDS_BOOMARK_BAR_OPEN_ALL);
+    delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
+                                   IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW);
+    delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
+                                   IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO);
   }
 
   delegate_->AddSeparator();
   if (selection_.size() == 1 && selection_[0]->is_folder()) {
-    delegate_->AddItem(IDS_BOOKMARK_BAR_RENAME_FOLDER);
+    delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_RENAME_FOLDER,
+                                   IDS_BOOKMARK_BAR_RENAME_FOLDER);
   } else {
-    delegate_->AddItem(IDS_BOOKMARK_BAR_EDIT);
+    delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_EDIT,
+                                   IDS_BOOKMARK_BAR_EDIT);
   }
 
   delegate_->AddSeparator();
-  delegate_->AddItem(IDS_CUT);
-  delegate_->AddItem(IDS_COPY);
-  delegate_->AddItem(IDS_PASTE);
+  delegate_->AddItemWithStringId(IDC_CUT, IDS_CUT);
+  delegate_->AddItemWithStringId(IDC_COPY, IDS_COPY);
+  delegate_->AddItemWithStringId(IDC_PASTE, IDS_PASTE);
 
   delegate_->AddSeparator();
-  delegate_->AddItem(IDS_BOOKMARK_BAR_REMOVE);
+  delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_REMOVE,
+                                 IDS_BOOKMARK_BAR_REMOVE);
 
   delegate_->AddSeparator();
-  delegate_->AddItem(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK);
-  delegate_->AddItem(IDS_BOOMARK_BAR_NEW_FOLDER);
+  delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK,
+                                 IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK);
+  delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_NEW_FOLDER,
+                                 IDS_BOOMARK_BAR_NEW_FOLDER);
 
   delegate_->AddSeparator();
-  delegate_->AddItem(IDS_BOOKMARK_MANAGER);
-  delegate_->AddCheckboxItem(IDS_BOOMARK_BAR_ALWAYS_SHOW);
+  delegate_->AddItemWithStringId(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
+  delegate_->AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW,
+                             IDS_BOOMARK_BAR_ALWAYS_SHOW);
 }
 
 void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
   BookmarkModel* model = RemoveModelObserver();
 
   switch (id) {
-    case IDS_BOOMARK_BAR_OPEN_ALL:
-    case IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO:
-    case IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW: {
+    case IDC_BOOKMARK_BAR_OPEN_ALL:
+    case IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO:
+    case IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW: {
       WindowOpenDisposition initial_disposition;
-      if (id == IDS_BOOMARK_BAR_OPEN_ALL) {
+      if (id == IDC_BOOKMARK_BAR_OPEN_ALL) {
         initial_disposition = NEW_FOREGROUND_TAB;
         UserMetrics::RecordAction(
             UserMetricsAction("BookmarkBar_ContextMenu_OpenAll"),
             profile_);
-      } else if (id == IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW) {
+      } else if (id == IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW) {
         initial_disposition = NEW_WINDOW;
         UserMetrics::RecordAction(
             UserMetricsAction("BookmarkBar_ContextMenu_OpenAllInNewWindow"),
@@ -109,8 +119,8 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       break;
     }
 
-    case IDS_BOOKMARK_BAR_RENAME_FOLDER:
-    case IDS_BOOKMARK_BAR_EDIT:
+    case IDC_BOOKMARK_BAR_RENAME_FOLDER:
+    case IDC_BOOKMARK_BAR_EDIT:
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Edit"), profile_);
 
@@ -130,7 +140,7 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       }
       break;
 
-    case IDS_BOOKMARK_BAR_REMOVE: {
+    case IDC_BOOKMARK_BAR_REMOVE: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Remove"), profile_);
 
@@ -144,7 +154,7 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       break;
     }
 
-    case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK: {
+    case IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Add"), profile_);
 
@@ -156,7 +166,7 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       break;
     }
 
-    case IDS_BOOMARK_BAR_NEW_FOLDER: {
+    case IDC_BOOKMARK_BAR_NEW_FOLDER: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_NewFolder"),
           profile_);
@@ -168,11 +178,11 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       break;
     }
 
-    case IDS_BOOMARK_BAR_ALWAYS_SHOW:
+    case IDC_BOOKMARK_BAR_ALWAYS_SHOW:
       bookmark_utils::ToggleWhenVisible(profile_);
       break;
 
-    case IDS_BOOKMARK_MANAGER:
+    case IDC_BOOKMARK_MANAGER:
       UserMetrics::RecordAction(UserMetricsAction("ShowBookmarkManager"),
                                 profile_);
       {
@@ -184,17 +194,17 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       }
       break;
 
-    case IDS_CUT:
+    case IDC_CUT:
       delegate_->WillRemoveBookmarks(selection_);
       bookmark_utils::CopyToClipboard(model, selection_, true);
       delegate_->DidRemoveBookmarks();
       break;
 
-    case IDS_COPY:
+    case IDC_COPY:
       bookmark_utils::CopyToClipboard(model, selection_, false);
       break;
 
-    case IDS_PASTE: {
+    case IDC_PASTE: {
       int index;
       const BookmarkNode* paste_target =
           bookmark_utils::GetParentForNewNodes(parent_, selection_, &index);
@@ -211,7 +221,7 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
 }
 
 bool BookmarkContextMenuControllerViews::IsItemChecked(int id) const {
-  DCHECK(id == IDS_BOOMARK_BAR_ALWAYS_SHOW);
+  DCHECK(id == IDC_BOOKMARK_BAR_ALWAYS_SHOW);
   return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
 }
 
@@ -220,33 +230,33 @@ bool BookmarkContextMenuControllerViews::IsCommandEnabled(int id) const {
       (selection_.size() == 1 &&
        selection_[0]->GetParent() == model_->root_node());
   switch (id) {
-    case IDS_BOOMARK_BAR_OPEN_INCOGNITO:
+    case IDC_BOOKMARK_BAR_OPEN_INCOGNITO:
       return !profile_->IsOffTheRecord();
 
-    case IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO:
+    case IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO:
       return HasURLs() && !profile_->IsOffTheRecord();
 
-    case IDS_BOOMARK_BAR_OPEN_ALL:
-    case IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW:
+    case IDC_BOOKMARK_BAR_OPEN_ALL:
+    case IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW:
       return HasURLs();
 
-    case IDS_BOOKMARK_BAR_RENAME_FOLDER:
-    case IDS_BOOKMARK_BAR_EDIT:
+    case IDC_BOOKMARK_BAR_RENAME_FOLDER:
+    case IDC_BOOKMARK_BAR_EDIT:
       return selection_.size() == 1 && !is_root_node;
 
-    case IDS_BOOKMARK_BAR_REMOVE:
+    case IDC_BOOKMARK_BAR_REMOVE:
       return !selection_.empty() && !is_root_node;
 
-    case IDS_BOOMARK_BAR_NEW_FOLDER:
-    case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK:
+    case IDC_BOOKMARK_BAR_NEW_FOLDER:
+    case IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK:
       return bookmark_utils::GetParentForNewNodes(
           parent_, selection_, NULL) != NULL;
 
-    case IDS_COPY:
-    case IDS_CUT:
+    case IDC_COPY:
+    case IDC_CUT:
       return selection_.size() > 0 && !is_root_node;
 
-    case IDS_PASTE:
+    case IDC_PASTE:
       // Paste to selection from the Bookmark Bar, to parent_ everywhere else
       return (!selection_.empty() &&
               bookmark_utils::CanPasteFromClipboard(selection_[0])) ||
diff --git a/chrome/browser/ui/views/bookmark_context_menu_controller_views.h b/chrome/browser/ui/views/bookmark_context_menu_controller_views.h
index fc3537a..1246a96 100644
--- a/chrome/browser/ui/views/bookmark_context_menu_controller_views.h
+++ b/chrome/browser/ui/views/bookmark_context_menu_controller_views.h
@@ -26,10 +26,9 @@ class BookmarkContextMenuControllerViewsDelegate {
   virtual void CloseMenu() = 0;
 
   // Methods that add items to the underlying menu.
-  virtual void AddItem(int command_id) = 0;
   virtual void AddItemWithStringId(int command_id, int string_id) = 0;
   virtual void AddSeparator() = 0;
-  virtual void AddCheckboxItem(int command_id) = 0;
+  virtual void AddCheckboxItem(int command_id, int string_id) = 0;
 
   // Sent before bookmarks are removed.
   virtual void WillRemoveBookmarks(
diff --git a/chrome/browser/ui/views/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmark_context_menu_test.cc
index 477e9f4..8cf12d4 100644
--- a/chrome/browser/ui/views/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmark_context_menu_test.cc
@@ -4,6 +4,7 @@
 
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_thread.h"
@@ -113,9 +114,9 @@ TEST_F(BookmarkContextMenuTest, DeleteURL) {
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
   GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetURL();
-  ASSERT_TRUE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+  ASSERT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   // Delete the URL.
-  controller.ExecuteCommand(IDS_BOOKMARK_BAR_REMOVE);
+  controller.ExecuteCommand(IDC_BOOKMARK_BAR_REMOVE);
   // Model shouldn't have URL anymore.
   ASSERT_FALSE(model_->IsBookmarked(url));
 }
@@ -138,15 +139,16 @@ TEST_F(BookmarkContextMenuTest, EmptyNodes) {
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, model_->other_node(),
       std::vector<const BookmarkNode*>());
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_FALSE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
+  EXPECT_FALSE(
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied a vector with a single
@@ -156,15 +158,15 @@ TEST_F(BookmarkContextMenuTest, SingleURL) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied a vector with multiple
@@ -175,15 +177,15 @@ TEST_F(BookmarkContextMenuTest, MultipleURLs) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(1)->GetChild(0));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied an vector with a single
@@ -193,15 +195,16 @@ TEST_F(BookmarkContextMenuTest, SingleFolder) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_FALSE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied a vector with multiple
@@ -212,15 +215,16 @@ TEST_F(BookmarkContextMenuTest, MultipleEmptyFolders) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_FALSE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied a vector with multiple
@@ -231,15 +235,15 @@ TEST_F(BookmarkContextMenuTest, MultipleFoldersWithURLs) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(4));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of open incognito.
@@ -249,8 +253,9 @@ TEST_F(BookmarkContextMenuTest, DisableIncognito) {
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
   profile_->set_off_the_record(true);
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_INCOGNITO));
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_INCOGNITO));
+  EXPECT_FALSE(
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
 }
 
 // Tests that you can't remove/edit when showing the other node.
@@ -259,8 +264,8 @@ TEST_F(BookmarkContextMenuTest, DisabledItemsWithOtherNode) {
   nodes.push_back(model_->other_node());
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0], nodes);
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_EDIT));
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_EDIT));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
 }
 
 // Tests the enabled state of the menus when supplied an empty vector and null
@@ -268,15 +273,16 @@ TEST_F(BookmarkContextMenuTest, DisabledItemsWithOtherNode) {
 TEST_F(BookmarkContextMenuTest, EmptyNodesNullParent) {
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, NULL, std::vector<const BookmarkNode*>());
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_FALSE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_FALSE(controller.IsCommandEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_FALSE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_FALSE(
-      controller.IsCommandEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
@@ -284,16 +290,16 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
   scoped_ptr<BookmarkContextMenu> controller(new BookmarkContextMenu(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
-  EXPECT_TRUE(controller->IsCommandEnabled(IDS_COPY));
-  EXPECT_TRUE(controller->IsCommandEnabled(IDS_CUT));
+  EXPECT_TRUE(controller->IsCommandEnabled(IDC_COPY));
+  EXPECT_TRUE(controller->IsCommandEnabled(IDC_CUT));
 
   // Copy the URL.
-  controller->ExecuteCommand(IDS_COPY);
+  controller->ExecuteCommand(IDC_COPY);
 
   controller.reset(new BookmarkContextMenu(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
   int old_count = model_->GetBookmarkBarNode()->GetChildCount();
-  controller->ExecuteCommand(IDS_PASTE);
+  controller->ExecuteCommand(IDC_PASTE);
 
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_url());
   ASSERT_EQ(old_count + 1, model_->GetBookmarkBarNode()->GetChildCount());
@@ -303,7 +309,7 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
   controller.reset(new BookmarkContextMenu(
       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
   // Cut the URL.
-  controller->ExecuteCommand(IDS_CUT);
+  controller->ExecuteCommand(IDC_CUT);
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder());
   ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount());