[Extensions] Update ExtensionContextMenuModel::MenuEntries names

A few of the name values for the menu entries in the
ExtensionContextMenuModel were a little misleading. Remap the
following (<old> -> <new>):
- NAME -> HOME_PAGE (opens the extension's home page, or the webstore
  if a separate home page was not specified).
- CONFIGURE - OPTIONS (opens the extension's options page)
- MANAGE -> MANAGE_EXTENSIONS (opens the chrome://extensions page)

No functional change is intended; this is purely a renaming of code
values.

Bug: None

Change-Id: Iabac73bf3bd7d85ea02b23379a9a19eeef02cf21
Reviewed-on: https://chromium-review.googlesource.com/1229774Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593082}

chrome/browser/extensions/extension_context_menu_model.cc

@@ -199,14 +199,14 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {
     return extension_items_->IsCommandIdEnabled(command_id);
 
   switch (command_id) {
-    case NAME:
-      // The NAME links to the Homepage URL. If the extension doesn't have a
-      // homepage, we just disable this menu item. We also disable for component
-      // extensions, because it doesn't make sense to link to a webstore page or
-      // chrome://extensions.
+    case HOME_PAGE:
+      // The HOME_PAGE links to the Homepage URL. If the extension doesn't have
+      // a homepage, we just disable this menu item. We also disable for
+      // component extensions, because it doesn't make sense to link to a
+      // webstore page or chrome://extensions.
       return ManifestURL::GetHomepageURL(extension).is_valid() &&
              !is_component_;
-    case CONFIGURE:
+    case OPTIONS:
       return OptionsPageInfo::HasOptionsPage(extension);
     case INSPECT_POPUP: {
       content::WebContents* web_contents = GetActiveWebContents();
@@ -218,7 +218,7 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const {
       return !IsExtensionRequiredByPolicy(extension, profile_);
     // The following, if they are present, are always enabled.
     case TOGGLE_VISIBILITY:
-    case MANAGE:
+    case MANAGE_EXTENSIONS:
     case PAGE_ACCESS_SUBMENU:
     case PAGE_ACCESS_RUN_ON_CLICK:
     case PAGE_ACCESS_RUN_ON_SITE:
@@ -245,7 +245,7 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id,
   }
 
   switch (command_id) {
-    case NAME: {
+    case HOME_PAGE: {
       content::OpenURLParams params(ManifestURL::GetHomepageURL(extension),
                                     content::Referrer(),
                                     WindowOpenDisposition::NEW_FOREGROUND_TAB,
@@ -253,7 +253,7 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id,
       browser_->OpenURL(params);
       break;
     }
-    case CONFIGURE:
+    case OPTIONS:
       DCHECK(OptionsPageInfo::HasOptionsPage(extension));
       ExtensionTabUtil::OpenOptionsPage(extension, browser_);
       break;
@@ -267,7 +267,7 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id,
       UninstallDialogHelper::UninstallExtension(browser_, extension);
       break;
     }
-    case MANAGE: {
+    case MANAGE_EXTENSIONS: {
       chrome::ShowExtensions(browser_, extension->id());
       break;
     }
@@ -308,14 +308,14 @@ void ExtensionContextMenuModel::InitMenu(const Extension* extension,
   // Ampersands need to be escaped to avoid being treated like
   // mnemonics in the menu.
   base::ReplaceChars(extension_name, "&", "&&", &extension_name);
-  AddItem(NAME, base::UTF8ToUTF16(extension_name));
+  AddItem(HOME_PAGE, base::UTF8ToUTF16(extension_name));
   AppendExtensionItems();
   AddSeparator(ui::NORMAL_SEPARATOR);
 
   CreatePageAccessSubmenu(extension);
 
   if (!is_component_ || OptionsPageInfo::HasOptionsPage(extension))
-    AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS_MENU_ITEM);
+    AddItemWithStringId(OPTIONS, IDS_EXTENSIONS_OPTIONS_MENU_ITEM);
 
   if (!is_component_) {
     bool is_required_by_policy =
@@ -340,7 +340,7 @@ void ExtensionContextMenuModel::InitMenu(const Extension* extension,
 
   if (!is_component_) {
     AddSeparator(ui::NORMAL_SEPARATOR);
-    AddItemWithStringId(MANAGE, IDS_MANAGE_EXTENSION);
+    AddItemWithStringId(MANAGE_EXTENSIONS, IDS_MANAGE_EXTENSION);
   }
 
   const ActionInfo* action_info = ActionInfo::GetPageActionInfo(extension);

chrome/browser/extensions/extension_context_menu_model.h

@@ -28,11 +28,11 @@ class ExtensionContextMenuModel : public ui::SimpleMenuModel,
                                   public ui::SimpleMenuModel::Delegate {
  public:
   enum MenuEntries {
-    NAME = 0,
-    CONFIGURE,
+    HOME_PAGE = 0,
+    OPTIONS,
     TOGGLE_VISIBILITY,
     UNINSTALL,
-    MANAGE,
+    MANAGE_EXTENSIONS,
     INSPECT_POPUP,
     PAGE_ACCESS_SUBMENU,
     PAGE_ACCESS_RUN_ON_CLICK,

chrome/browser/extensions/extension_context_menu_model_unittest.cc

@@ -406,15 +406,16 @@ TEST_F(ExtensionContextMenuModelTest, ComponentExtensionContextMenu) {
     // A component extension's context menu should not include options for
     // managing extensions or removing it, and should only include an option for
     // the options page if the extension has one (which this one doesn't).
-    EXPECT_EQ(-1,
-              menu.GetIndexOfCommandId(ExtensionContextMenuModel::CONFIGURE));
+    EXPECT_EQ(-1, menu.GetIndexOfCommandId(ExtensionContextMenuModel::OPTIONS));
     EXPECT_EQ(-1,
               menu.GetIndexOfCommandId(ExtensionContextMenuModel::UNINSTALL));
-    EXPECT_EQ(-1, menu.GetIndexOfCommandId(ExtensionContextMenuModel::MANAGE));
+    EXPECT_EQ(-1, menu.GetIndexOfCommandId(
+                      ExtensionContextMenuModel::MANAGE_EXTENSIONS));
     // The "name" option should be present, but not enabled for component
     // extensions.
-    EXPECT_NE(-1, menu.GetIndexOfCommandId(ExtensionContextMenuModel::NAME));
-    EXPECT_FALSE(menu.IsCommandIdEnabled(ExtensionContextMenuModel::NAME));
+    EXPECT_NE(-1,
+              menu.GetIndexOfCommandId(ExtensionContextMenuModel::HOME_PAGE));
+    EXPECT_FALSE(menu.IsCommandIdEnabled(ExtensionContextMenuModel::HOME_PAGE));
   }
 
   {
@@ -432,9 +433,8 @@ TEST_F(ExtensionContextMenuModelTest, ComponentExtensionContextMenu) {
                                    ExtensionContextMenuModel::VISIBLE, nullptr);
     service()->AddExtension(extension.get());
     EXPECT_TRUE(extensions::OptionsPageInfo::HasOptionsPage(extension.get()));
-    EXPECT_NE(-1,
-              menu.GetIndexOfCommandId(ExtensionContextMenuModel::CONFIGURE));
-    EXPECT_TRUE(menu.IsCommandIdEnabled(ExtensionContextMenuModel::CONFIGURE));
+    EXPECT_NE(-1, menu.GetIndexOfCommandId(ExtensionContextMenuModel::OPTIONS));
+    EXPECT_TRUE(menu.IsCommandIdEnabled(ExtensionContextMenuModel::OPTIONS));
   }
 }
 
@@ -581,12 +581,13 @@ TEST_F(ExtensionContextMenuModelTest,
 
   ExtensionContextMenuModel menu(extension, GetBrowser(),
                                  ExtensionContextMenuModel::VISIBLE, nullptr);
-  EXPECT_TRUE(menu.IsCommandIdVisible(ExtensionContextMenuModel::NAME));
-  EXPECT_TRUE(menu.IsCommandIdVisible(ExtensionContextMenuModel::CONFIGURE));
+  EXPECT_TRUE(menu.IsCommandIdVisible(ExtensionContextMenuModel::HOME_PAGE));
+  EXPECT_TRUE(menu.IsCommandIdVisible(ExtensionContextMenuModel::OPTIONS));
   EXPECT_TRUE(
       menu.IsCommandIdVisible(ExtensionContextMenuModel::TOGGLE_VISIBILITY));
   EXPECT_TRUE(menu.IsCommandIdVisible(ExtensionContextMenuModel::UNINSTALL));
-  EXPECT_TRUE(menu.IsCommandIdVisible(ExtensionContextMenuModel::MANAGE));
+  EXPECT_TRUE(
+      menu.IsCommandIdVisible(ExtensionContextMenuModel::MANAGE_EXTENSIONS));
   EXPECT_TRUE(
       menu.IsCommandIdVisible(ExtensionContextMenuModel::INSPECT_POPUP));
   EXPECT_TRUE(menu.IsCommandIdVisible(