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

3 files changed, 106 insertions, 107 deletions

diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
index 36a81af..b962526 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.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"
@@ -48,44 +49,42 @@ BookmarkContextMenuController::~BookmarkContextMenuController() {
 
 void BookmarkContextMenuController::BuildMenu() {
   if (selection_.size() == 1 && selection_[0]->is_url()) {
-    AddItem(IDS_BOOMARK_BAR_OPEN_ALL,
+    AddItem(IDC_BOOKMARK_BAR_OPEN_ALL,
             IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB);
-    AddItem(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW,
+    AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
             IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW);
-    AddItem(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO,
+    AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
             IDS_BOOMARK_BAR_OPEN_INCOGNITO);
   } else {
-    AddItem(IDS_BOOMARK_BAR_OPEN_ALL);
-    AddItem(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW);
-    AddItem(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO);
+    AddItem(IDC_BOOKMARK_BAR_OPEN_ALL, IDS_BOOMARK_BAR_OPEN_ALL);
+    AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
+        IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW);
+    AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
+        IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO);
   }
 
   AddSeparator();
   if (selection_.size() == 1 && selection_[0]->is_folder()) {
-    AddItem(IDS_BOOKMARK_BAR_RENAME_FOLDER);
+    AddItem(IDC_BOOKMARK_BAR_RENAME_FOLDER, IDS_BOOKMARK_BAR_RENAME_FOLDER);
   } else {
-    AddItem(IDS_BOOKMARK_BAR_EDIT);
+    AddItem(IDC_BOOKMARK_BAR_EDIT, IDS_BOOKMARK_BAR_EDIT);
   }
 
   AddSeparator();
-  AddItem(IDS_CUT);
-  AddItem(IDS_COPY);
-  AddItem(IDS_PASTE);
+  AddItem(IDC_CUT, IDS_CUT);
+  AddItem(IDC_COPY, IDS_COPY);
+  AddItem(IDC_PASTE, IDS_PASTE);
 
   AddSeparator();
-  AddItem(IDS_BOOKMARK_BAR_REMOVE);
+  AddItem(IDC_BOOKMARK_BAR_REMOVE, IDS_BOOKMARK_BAR_REMOVE);
 
   AddSeparator();
-  AddItem(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK);
-  AddItem(IDS_BOOMARK_BAR_NEW_FOLDER);
+  AddItem(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK, IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK);
+  AddItem(IDC_BOOKMARK_BAR_NEW_FOLDER, IDS_BOOMARK_BAR_NEW_FOLDER);
 
   AddSeparator();
-  AddItem(IDS_BOOKMARK_MANAGER);
-  AddCheckboxItem(IDS_BOOMARK_BAR_ALWAYS_SHOW);
-}
-
-void BookmarkContextMenuController::AddItem(int id) {
-  menu_model_->AddItem(id, l10n_util::GetStringUTF16(id));
+  AddItem(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
+  AddCheckboxItem(IDC_BOOKMARK_BAR_ALWAYS_SHOW, IDS_BOOMARK_BAR_ALWAYS_SHOW);
 }
 
 void BookmarkContextMenuController::AddItem(int id, int localization_id) {
@@ -96,8 +95,9 @@ void BookmarkContextMenuController::AddSeparator() {
   menu_model_->AddSeparator();
 }
 
-void BookmarkContextMenuController::AddCheckboxItem(int id) {
-  menu_model_->AddCheckItemWithStringId(id, id);
+void BookmarkContextMenuController::AddCheckboxItem(int id,
+                                                    int localization_id) {
+  menu_model_->AddCheckItemWithStringId(id, localization_id);
 }
 
 void BookmarkContextMenuController::ExecuteCommand(int id) {
@@ -105,16 +105,16 @@ void BookmarkContextMenuController::ExecuteCommand(int id) {
     delegate_->WillExecuteCommand();
 
   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"),
@@ -130,8 +130,8 @@ void BookmarkContextMenuController::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_);
@@ -152,7 +152,7 @@ void BookmarkContextMenuController::ExecuteCommand(int id) {
       }
       break;
 
-    case IDS_BOOKMARK_BAR_REMOVE: {
+    case IDC_BOOKMARK_BAR_REMOVE: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Remove"),
           profile_);
@@ -165,7 +165,7 @@ void BookmarkContextMenuController::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_);
@@ -178,7 +178,7 @@ void BookmarkContextMenuController::ExecuteCommand(int id) {
       break;
     }
 
-    case IDS_BOOMARK_BAR_NEW_FOLDER: {
+    case IDC_BOOKMARK_BAR_NEW_FOLDER: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_NewFolder"),
           profile_);
@@ -190,11 +190,11 @@ void BookmarkContextMenuController::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_);
       {
@@ -206,15 +206,15 @@ void BookmarkContextMenuController::ExecuteCommand(int id) {
       }
       break;
 
-    case IDS_CUT:
+    case IDC_CUT:
       bookmark_utils::CopyToClipboard(model_, selection_, true);
       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);
@@ -234,7 +234,7 @@ void BookmarkContextMenuController::ExecuteCommand(int id) {
 }
 
 bool BookmarkContextMenuController::IsCommandIdChecked(int command_id) const {
-  DCHECK(command_id == IDS_BOOMARK_BAR_ALWAYS_SHOW);
+  DCHECK(command_id == IDC_BOOKMARK_BAR_ALWAYS_SHOW);
   return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
 }
 
@@ -243,33 +243,33 @@ bool BookmarkContextMenuController::IsCommandIdEnabled(int command_id) const {
       (selection_.size() == 1 &&
        selection_[0]->GetParent() == model_->root_node());
   switch (command_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/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/bookmarks/bookmark_context_menu_controller.h
index 76ffaa4..b047a1b 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.h
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.h
@@ -70,14 +70,12 @@ class BookmarkContextMenuController : public BaseBookmarkModelObserver,
   PageNavigator* navigator() const { return navigator_; }
 
  private:
-  // Adds a IDS_* style command to the menu.
-  void AddItem(int id);
-  // Adds a IDS_* style command to the menu with a different localized string.
+  // Adds a IDC_* style command to the menu with a localized string.
   void AddItem(int id, int localization_id);
   // Adds a separator to the menu.
   void AddSeparator();
   // Adds a checkable item to the menu.
-  void AddCheckboxItem(int id);
+  void AddCheckboxItem(int id, int localization_id);
 
   // Overridden from BaseBookmarkModelObserver:
   // Any change to the model results in closing the menu.
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
index be4effe..311237f 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.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_context_menu_controller.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -109,9 +110,9 @@ TEST_F(BookmarkContextMenuControllerTest, DeleteURL) {
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
   GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetURL();
-  ASSERT_TRUE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+  ASSERT_TRUE(controller.IsCommandIdEnabled(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));
 }
@@ -134,16 +135,16 @@ TEST_F(BookmarkContextMenuControllerTest, EmptyNodes) {
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, model_->other_node(),
       std::vector<const BookmarkNode*>());
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied a vector with a single
@@ -153,16 +154,16 @@ TEST_F(BookmarkContextMenuControllerTest, SingleURL) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_TRUE(controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied a vector with multiple
@@ -173,16 +174,16 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleURLs) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(1)->GetChild(0));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_TRUE(controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied an vector with a single
@@ -192,16 +193,16 @@ TEST_F(BookmarkContextMenuControllerTest, SingleFolder) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied a vector with multiple
@@ -212,16 +213,16 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleEmptyFolders) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of the menus when supplied a vector with multiple
@@ -232,16 +233,16 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleFoldersWithURLs) {
   nodes.push_back(model_->GetBookmarkBarNode()->GetChild(4));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
-  EXPECT_TRUE(controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_TRUE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_TRUE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 // Tests the enabled state of open incognito.
@@ -251,9 +252,9 @@ TEST_F(BookmarkContextMenuControllerTest, DisableIncognito) {
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes);
   profile_->set_off_the_record(true);
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_INCOGNITO));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_INCOGNITO));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
 }
 
 // Tests that you can't remove/edit when showing the other node.
@@ -262,8 +263,8 @@ TEST_F(BookmarkContextMenuControllerTest, DisabledItemsWithOtherNode) {
   nodes.push_back(model_->other_node());
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0], nodes);
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_EDIT));
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_EDIT));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
 }
 
 // Tests the enabled state of the menus when supplied an empty vector and null
@@ -272,16 +273,16 @@ TEST_F(BookmarkContextMenuControllerTest, EmptyNodesNullParent) {
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, NULL,
       std::vector<const BookmarkNode*>());
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
-  EXPECT_FALSE(controller.IsCommandIdEnabled(IDS_BOOKMARK_BAR_REMOVE));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO));
+  EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK));
   EXPECT_FALSE(
-      controller.IsCommandIdEnabled(IDS_BOOMARK_BAR_NEW_FOLDER));
+      controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
 }
 
 TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
@@ -290,16 +291,16 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
   scoped_ptr<BookmarkContextMenuController> controller(
       new BookmarkContextMenuController(
           NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
-  EXPECT_TRUE(controller->IsCommandIdEnabled(IDS_COPY));
-  EXPECT_TRUE(controller->IsCommandIdEnabled(IDS_CUT));
+  EXPECT_TRUE(controller->IsCommandIdEnabled(IDC_COPY));
+  EXPECT_TRUE(controller->IsCommandIdEnabled(IDC_CUT));
 
   // Copy the URL.
-  controller->ExecuteCommand(IDS_COPY);
+  controller->ExecuteCommand(IDC_COPY);
 
   controller.reset(new BookmarkContextMenuController(
       NULL, 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());
@@ -309,7 +310,7 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
   controller.reset(new BookmarkContextMenuController(
       NULL, 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());