Separate out logic to handle different category/group of context menu items from RVContextMenu class

chrome/browser/tab_contents/render_view_context_menu.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 29 matching lines @@
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
+#include "chrome/browser/tab_contents/menu_category_factory.h"
 #include "chrome/browser/tab_contents/retargeting_details.h"
 #include "chrome/browser/tab_contents/spellchecker_submenu_observer.h"
 #include "chrome/browser/tab_contents/spelling_menu_observer.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
@@ skipping 347 matching lines @@
       render_frame_id_(render_frame_host->GetRoutingID()),
       profile_(Profile::FromBrowserContext(
           source_web_contents_->GetBrowserContext())),
       menu_model_(this),
       extension_items_(profile_, this, &menu_model_,
                     base::Bind(MenuItemMatchesParams, params_)),
       speech_input_submenu_model_(this),
       protocol_handler_submenu_model_(this),
       protocol_handler_registry_(
           ProtocolHandlerRegistryFactory::GetForProfile(profile_)),
-      command_executed_(false),
-      is_guest_(false) {
-  RenderViewHost* rvh = source_web_contents_->GetRenderViewHost();
-  if (rvh && rvh->GetProcess()->IsGuest())
-    is_guest_ = true;
+      command_executed_(false) {
+  menu_category_.reset(MenuCategoryFactory::Create(source_web_contents_,
+                                                   render_frame_host, params));
 }
 
 RenderViewContextMenu::~RenderViewContextMenu() {
 }
 
 // Menu construction functions -------------------------------------------------
 
 void RenderViewContextMenu::Init() {
   InitMenu();
   PlatformInit();
@@ skipping 123 matching lines @@
     const std::string& id = map_ids[sorted_menu_titles[i]];
     extension_items_.AppendExtensionItems(id, printable_selection_text,
                                           &index);
   }
 
   UMA_HISTOGRAM_TIMES("Extensions.ContextMenus_BuildTime",
                       base::TimeTicks::Now() - begin);
   UMA_HISTOGRAM_COUNTS("Extensions.ContextMenus_ItemCount", index);
 }
 
+void RenderViewContextMenu::AppendCurrentExtensionItems() {
+  // Avoid appending extension related items when |extension| is null. This
+  // happens when the panel is navigated to a url outside of the extension's
+  // package.
+  const Extension* extension = GetExtension();
+  if (extension) {
+    // Only add extension items from this extension.
+    int index = 0;
+    extension_items_.AppendExtensionItems(extension->id(),
+                                          PrintableSelectionText(), &index);
+  }
+}
+
 void RenderViewContextMenu::InitMenu() {
-  if (chrome::IsRunningInForcedAppMode()) {
-    AppendAppModeItems();
-    return;
+  int items = menu_category_->GetCategories();
+
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_CUSTOM))

[Fady Samuel, 2014/02/24 19:07:29]

I would prefer this syntax:

if (context_->SupportsCategory(MenuContext::ITEM_CATEGORY_CUSTOM))

[lazyboy, 2014/02/24 23:45:00]

Done.

+    AppendCustomItems();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_PAGE))
+    AppendPageItems();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_FRAME)) {
+    DCHECK(items & MenuCategoryBase::ITEM_CATEGORY_PAGE);
+    AppendFrameItems();
   }
-
-  extensions::ViewType view_type =
-      extensions::GetViewType(source_web_contents_);
-  if (view_type == extensions::VIEW_TYPE_APP_WINDOW) {
-    AppendPlatformAppItems();
-    return;
-  } else if (view_type == extensions::VIEW_TYPE_EXTENSION_POPUP) {
-    AppendPopupExtensionItems();
-    return;
-  } else if (view_type == extensions::VIEW_TYPE_PANEL) {
-    AppendPanelItems();
-    return;
-  }
-
-  const bool has_link = !params_.unfiltered_link_url.is_empty();
-  const bool has_selection = !params_.selection_text.empty();
-
-  if (AppendCustomItems()) {
-    // If there's a selection, don't early return when there are custom items,
-    // but fall through to adding the normal ones after the custom ones.
-    if (has_selection) {
-      menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
-    } else {
-      // Don't add items for Pepper menu.
-      if (!params_.custom_context.is_pepper_menu)
-        AppendDeveloperItems();
-      return;
-    }
-  }
-
-  // When no special node or text is selected and selection has no link,
-  // show page items.
-  if (params_.media_type == WebContextMenuData::MediaTypeNone &&
-      !has_link &&
-      !params_.is_editable &&
-      !is_guest_ &&
-      !has_selection) {
-    if (!params_.page_url.is_empty()) {
-      bool is_devtools = IsDevToolsURL(params_.page_url);
-      if (!is_devtools && !IsInternalResourcesURL(params_.page_url)) {
-        AppendPageItems();
-        // Merge in frame items if we clicked within a frame that needs them.
-        if (!params_.frame_url.is_empty()) {
-          is_devtools = IsDevToolsURL(params_.frame_url);
-          if (!is_devtools && !IsInternalResourcesURL(params_.frame_url)) {
-            menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
-            AppendFrameItems();
-          }
-        }
-      }
-    } else {
-      DCHECK(params_.frame_url.is_empty());
-    }
-  }
-
-  // Do not show link related items for guest.
-  if (has_link && !is_guest_) {
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_LINK)) {
     AppendLinkItems();
     if (params_.media_type != WebContextMenuData::MediaTypeNone)
       menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   }
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_MEDIA_IMAGE))
+    AppendImageItems();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_SEARCHWEBFORIMAGE))
+    AppendSearchWebForImageItems();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_MEDIA_VIDEO))
+    AppendVideoItems();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_MEDIA_AUDIO))
+    AppendAudioItems();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_MEDIA_PLUGIN))
+    AppendPluginItems();
+  // if (items & (1 << ITEM_CATEGORY_MEDIA_FILE)) ...
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_EDITABLE))
+    AppendEditableItems();
 
-  switch (params_.media_type) {
-    case WebContextMenuData::MediaTypeNone:
-      break;
-    case WebContextMenuData::MediaTypeImage:
-      AppendImageItems();
-      break;
-    case WebContextMenuData::MediaTypeVideo:
-      AppendVideoItems();
-      break;
-    case WebContextMenuData::MediaTypeAudio:
-      AppendAudioItems();
-      break;
-    case WebContextMenuData::MediaTypePlugin:
-      AppendPluginItems();
-      break;
-#ifdef WEBCONTEXT_MEDIATYPEFILE_DEFINED
-    case WebContextMenuData::MediaTypeFile:
-      break;
-#endif
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_COPY)) {
+    DCHECK(!(items & (1 << MenuCategoryBase::ITEM_CATEGORY_EDITABLE)));
+    AppendCopyItem();
   }
 
-  if (params_.is_editable)
-    AppendEditableItems();
-  else if (has_selection)
-    AppendCopyItem();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_PRINT))
+    AppendPrintItem();
 
-  if (!is_guest_ && has_selection) {
-    AppendSearchProvider();
-    if (!IsDevToolsURL(params_.page_url))
-      AppendPrintItem();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_ALL_EXTENSION)) {
+    DCHECK(!(items & (1 << MenuCategoryBase::ITEM_CATEGORY_CURRENT_EXTENSION)));
+    AppendAllExtensionItems();
+  }
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_CURRENT_EXTENSION)) {
+    DCHECK(!(items & (1 << MenuCategoryBase::ITEM_CATEGORY_ALL_EXTENSION)));
+    AppendCurrentExtensionItems();
   }
 
-  if (!IsDevToolsURL(params_.page_url) && !is_guest_)
-    AppendAllExtensionItems();
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_DEVELOPER))
+    AppendDeveloperItems();
 
-  AppendDeveloperItems();
+  if (items &(1 << MenuCategoryBase::ITEM_CATEGORY_DEVTOOLS_UNPACKED_EXT))
+    AppendDevtoolsForUnpackedExtensions();
 
-  if (!is_guest_) {
+  if (items & (1 << MenuCategoryBase::ITEM_CATEGORY_PRINT_PREVIEW))
+    AppendPrintPreviewItems();
+}
+
+void RenderViewContextMenu::AppendPrintPreviewItems() {
 #if defined(ENABLE_FULL_PRINTING)
-    if (!print_preview_menu_observer_.get()) {
-      print_preview_menu_observer_.reset(
-          new PrintPreviewContextMenuObserver(source_web_contents_));
-    }
+  if (!print_preview_menu_observer_.get()) {
+    print_preview_menu_observer_.reset(
+        new PrintPreviewContextMenuObserver(source_web_contents_));
+  }
 
-    observers_.AddObserver(print_preview_menu_observer_.get());
+  observers_.AddObserver(print_preview_menu_observer_.get());
 #endif
-  }
 }
 
 const Extension* RenderViewContextMenu::GetExtension() const {
   extensions::ExtensionSystem* system =
       extensions::ExtensionSystem::Get(profile_);
   // There is no process manager in some tests.
   if (!system->process_manager())
     return NULL;
 
   return system->process_manager()->GetExtensionForRenderViewHost(
       source_web_contents_->GetRenderViewHost());
 }
 
-void RenderViewContextMenu::AppendAppModeItems() {
-  const bool has_selection = !params_.selection_text.empty();
-
-  if (params_.is_editable)
-    AppendEditableItems();
-  else if (has_selection)
-    AppendCopyItem();
-}
-
-void RenderViewContextMenu::AppendPlatformAppItems() {
-  const Extension* platform_app = GetExtension();
-
-  // The RVH might be for a process sandboxed from the extension.
-  if (!platform_app)
-    return;
-
-  DCHECK(platform_app->is_platform_app());
-
-  const bool has_selection = !params_.selection_text.empty();
-
-  // Add undo/redo, cut/copy/paste etc for text fields.
-  if (params_.is_editable)
-    AppendEditableItems();
-  else if (has_selection)
-    AppendCopyItem();
-
-  int index = 0;
-  extension_items_.AppendExtensionItems(platform_app->id(),
-                                        PrintableSelectionText(), &index);
-
-  // Add dev tools for unpacked extensions.
-  if (extensions::Manifest::IsUnpackedLocation(platform_app->location()) ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDebugPackedApps)) {
-    // Add a separator if there are any items already in the menu.
-    menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
-
-    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_RELOAD_PACKAGED_APP,
-                                    IDS_CONTENT_CONTEXT_RELOAD_PACKAGED_APP);
-    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_RESTART_PACKAGED_APP,
-                                    IDS_CONTENT_CONTEXT_RESTART_APP);
-    AppendDeveloperItems();
-    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE,
-                                    IDS_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE);
-  }
-}
-
-void RenderViewContextMenu::AppendPopupExtensionItems() {
-  const bool has_selection = !params_.selection_text.empty();
-
-  if (params_.is_editable)
-    AppendEditableItems();
-  else if (has_selection)
-    AppendCopyItem();
-
-  if (has_selection)
-    AppendSearchProvider();
-
-  AppendAllExtensionItems();
-  AppendDeveloperItems();
-}
-
-void RenderViewContextMenu::AppendPanelItems() {
-  bool has_selection = !params_.selection_text.empty();
-
-  // Checking link should take precedence before checking selection since on Mac
-  // right-clicking a link will also make it selected.
-  if (params_.unfiltered_link_url.is_valid())
-    AppendLinkItems();
-
-  if (params_.is_editable)
-    AppendEditableItems();
-  else if (has_selection)
-    AppendCopyItem();
-
-  // Avoid appending extension related items when |extension| is null. This
-  // happens when the panel is navigated to a url outside of the extension's
-  // package.
-  const Extension* extension = GetExtension();
-  if (extension) {
-    // Only add extension items from this extension.
-    int index = 0;
-    extension_items_.AppendExtensionItems(extension->id(),
-                                          PrintableSelectionText(), &index);
-  }
-}
-
 void RenderViewContextMenu::AddMenuItem(int command_id,
                                         const base::string16& title) {
   menu_model_.AddItem(command_id, title);
 }
 
 void RenderViewContextMenu::AddCheckItem(int command_id,
                                          const base::string16& title) {
   menu_model_.AddCheckItem(command_id, title);
 }
 
@@ skipping 46 matching lines @@
   if (!show_developer_items)
     return;
 
   // In the DevTools popup menu, "developer items" is normally the only
   // section, so omit the separator there.
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_INSPECTELEMENT,
                                   IDS_CONTENT_CONTEXT_INSPECTELEMENT);
 }
 
+void RenderViewContextMenu::AppendDevtoolsForUnpackedExtensions() {
+  // Add a separator if there are any items already in the menu.
+  menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_RELOAD_PACKAGED_APP,
+                                  IDS_CONTENT_CONTEXT_RELOAD_PACKAGED_APP);
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_RESTART_PACKAGED_APP,
+                                  IDS_CONTENT_CONTEXT_RESTART_APP);
+  AppendDeveloperItems();
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE,
+                                  IDS_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE);
+}
+
 void RenderViewContextMenu::AppendLinkItems() {
   if (!params_.link_url.is_empty()) {
     menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENLINKNEWTAB,
                                     IDS_CONTENT_CONTEXT_OPENLINKNEWTAB);
     menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW,
                                     IDS_CONTENT_CONTEXT_OPENLINKNEWWINDOW);
     if (params_.link_url.is_valid()) {
       AppendProtocolHandlerSubMenu();
     }
 
@@ skipping 12 matching lines @@
 
 void RenderViewContextMenu::AppendImageItems() {
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEIMAGEAS,
                                   IDS_CONTENT_CONTEXT_SAVEIMAGEAS);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYIMAGELOCATION,
                                   IDS_CONTENT_CONTEXT_COPYIMAGELOCATION);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYIMAGE,
                                   IDS_CONTENT_CONTEXT_COPYIMAGE);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB,
                                   IDS_CONTENT_CONTEXT_OPENIMAGENEWTAB);
+}
+
+void RenderViewContextMenu::AppendSearchWebForImageItems() {
   const TemplateURL* const default_provider =
       TemplateURLServiceFactory::GetForProfile(profile_)->
           GetDefaultSearchProvider();
-  if (!is_guest_ && params_.has_image_contents && default_provider &&
+  if (params_.has_image_contents && default_provider &&
       !default_provider->image_url().empty() &&
       default_provider->image_url_ref().IsValid()) {
     menu_model_.AddItem(
         IDC_CONTENT_CONTEXT_SEARCHWEBFORIMAGE,
         l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_SEARCHWEBFORIMAGE,
                                    default_provider->short_name()));
   }
-  AppendPrintItem();
 }
 
 void RenderViewContextMenu::AppendAudioItems() {
   AppendMediaItems();
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEAVAS,
                                   IDS_CONTENT_CONTEXT_SAVEAUDIOAS);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYAVLOCATION,
                                   IDS_CONTENT_CONTEXT_COPYAUDIOLOCATION);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENAVNEWTAB,
@@ skipping 1212 matching lines @@
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }