Desktop context menu reorganisation

chrome/browser/renderer_context_menu/render_view_context_menu.cc

 // Copyright 2014 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/renderer_context_menu/render_view_context_menu.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 20 matching lines @@
 #include "chrome/browser/extensions/devtools_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #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/renderer_context_menu/context_menu_content_type_factory.h"
-#include "chrome/browser/renderer_context_menu/spellchecker_submenu_observer.h"
 #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h"
 #include "chrome/browser/search/search.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/ssl/security_state_model.h"
 #include "chrome/browser/tab_contents/retargeting_details.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 96 matching lines @@
 
 const int kImageSearchThumbnailMinSize = 300 * 300;
 const int kImageSearchThumbnailMaxWidth = 600;
 const int kImageSearchThumbnailMaxHeight = 600;
 
 // Maps UMA enumeration to IDC. IDC could be changed so we can't use
 // just them and |UMA_HISTOGRAM_CUSTOM_ENUMERATION|.
 // Never change mapping or reuse |enum_id|. Always push back new items.
 // Items that is not used any more by |RenderViewContextMenu.ExecuteCommand|
 // could be deleted, but don't change the rest of |kUmaEnumToControlId|.
+//
+// |context_specific_enum_id| matches the ContextMenuOption histogram enum.
+// Used to track command usage under specific contexts - Specifically Menu

[Avi (use Gerrit), 2015/09/26 02:26:15]

"... specific contexts, specifically menu items..."

[edwardjung, 2015/09/28 14:11:25]

Done.

+// items under 'link + image' and 'selected text'.
 const struct UmaEnumCommandIdPair {
   int enum_id;
   int control_id;
+  int context_specific_enum_id;

[Avi (use Gerrit), 2015/09/26 02:26:15]

This order makes it hard to read the list. Do:

const struct UmaEnumCommandIdPair {
  int enum_id;
  int context_specific_enum_id;
  int control_id;
} //...

and _explicitly_ give values for the context_specific_enum_id in the list below.
You can use whatever value you want to mean "ain't none", but please don't rely
on the language to zero-fill.

[edwardjung, 2015/09/28 14:11:25]

Makes sense, done.

 } kUmaEnumToControlId[] = {
     /*
       enum id for 0, 1 are detected using
       RenderViewContextMenu::IsContentCustomCommandId and
       ContextMenuMatcher::IsExtensionsCustomCommandId
     */
     {2, IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST},
-    {3, IDC_CONTENT_CONTEXT_OPENLINKNEWTAB},
-    {4, IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW},
-    {5, IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD},
-    {6, IDC_CONTENT_CONTEXT_SAVELINKAS},
-    {7, IDC_CONTENT_CONTEXT_SAVEAVAS},
-    {8, IDC_CONTENT_CONTEXT_SAVEIMAGEAS},
-    {9, IDC_CONTENT_CONTEXT_COPYLINKLOCATION},
-    {10, IDC_CONTENT_CONTEXT_COPYIMAGELOCATION},
+    {3, IDC_CONTENT_CONTEXT_OPENLINKNEWTAB, 0},
+    {4, IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW, 15},
+    {5, IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD, 1},
+    {6, IDC_CONTENT_CONTEXT_SAVELINKAS, 5},
+    {7, IDC_CONTENT_CONTEXT_SAVEAVAS, 17},
+    {8, IDC_CONTENT_CONTEXT_SAVEIMAGEAS, 6},
+    {9, IDC_CONTENT_CONTEXT_COPYLINKLOCATION, 2},
+    {10, IDC_CONTENT_CONTEXT_COPYIMAGELOCATION, 10},
     {11, IDC_CONTENT_CONTEXT_COPYAVLOCATION},
-    {12, IDC_CONTENT_CONTEXT_COPYIMAGE},
-    {13, IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB},
+    {12, IDC_CONTENT_CONTEXT_COPYIMAGE, 9},
+    {13, IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB, 8},
     {14, IDC_CONTENT_CONTEXT_OPENAVNEWTAB},
     {15, IDC_CONTENT_CONTEXT_PLAYPAUSE},
     {16, IDC_CONTENT_CONTEXT_MUTE},
     {17, IDC_CONTENT_CONTEXT_LOOP},
     {18, IDC_CONTENT_CONTEXT_CONTROLS},
     {19, IDC_CONTENT_CONTEXT_ROTATECW},
     {20, IDC_CONTENT_CONTEXT_ROTATECCW},
     {21, IDC_BACK},
     {22, IDC_FORWARD},
     {23, IDC_SAVE_PAGE},
     {24, IDC_RELOAD},
     {25, IDC_CONTENT_CONTEXT_RELOAD_PACKAGED_APP},
     {26, IDC_CONTENT_CONTEXT_RESTART_PACKAGED_APP},
-    {27, IDC_PRINT},
+    {27, IDC_PRINT, 16},
     {28, IDC_VIEW_SOURCE},
     {29, IDC_CONTENT_CONTEXT_INSPECTELEMENT},
     {30, IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE},
     {31, IDC_CONTENT_CONTEXT_VIEWPAGEINFO},
     {32, IDC_CONTENT_CONTEXT_TRANSLATE},
     {33, IDC_CONTENT_CONTEXT_RELOADFRAME},
     {34, IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE},
     {35, IDC_CONTENT_CONTEXT_VIEWFRAMEINFO},
     {36, IDC_CONTENT_CONTEXT_UNDO},
     {37, IDC_CONTENT_CONTEXT_REDO},
     {38, IDC_CONTENT_CONTEXT_CUT},
-    {39, IDC_CONTENT_CONTEXT_COPY},
+    {39, IDC_CONTENT_CONTEXT_COPY, 4},
     {40, IDC_CONTENT_CONTEXT_PASTE},
     {41, IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE},
     {42, IDC_CONTENT_CONTEXT_DELETE},
     {43, IDC_CONTENT_CONTEXT_SELECTALL},
-    {44, IDC_CONTENT_CONTEXT_SEARCHWEBFOR},
+    {44, IDC_CONTENT_CONTEXT_SEARCHWEBFOR, 17},
     {45, IDC_CONTENT_CONTEXT_GOTOURL},
     {46, IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS},
     {47, IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_SETTINGS},
     {48, IDC_CONTENT_CONTEXT_ADDSEARCHENGINE},
     {52, IDC_CONTENT_CONTEXT_OPENLINKWITH},
     {53, IDC_CHECK_SPELLING_WHILE_TYPING},
     {54, IDC_SPELLCHECK_MENU},
     {55, IDC_CONTENT_CONTEXT_SPELLING_TOGGLE},
     {56, IDC_SPELLCHECK_LANGUAGES_FIRST},
-    {57, IDC_CONTENT_CONTEXT_SEARCHWEBFORIMAGE},
+    {57, IDC_CONTENT_CONTEXT_SEARCHWEBFORIMAGE, 11},
     {58, IDC_SPELLCHECK_SUGGESTION_0},
     {59, IDC_SPELLCHECK_ADD_TO_DICTIONARY},
     {60, IDC_SPELLPANEL_TOGGLE},
     {61, IDC_CONTENT_CONTEXT_OPEN_ORIGINAL_IMAGE_NEW_TAB},
     {62, IDC_WRITING_DIRECTION_MENU},
     {63, IDC_WRITING_DIRECTION_DEFAULT},
     {64, IDC_WRITING_DIRECTION_LTR},
     {65, IDC_WRITING_DIRECTION_RTL},
     {66, IDC_CONTENT_CONTEXT_LOAD_ORIGINAL_IMAGE},
     {67, IDC_CONTENT_CONTEXT_FORCESAVEPASSWORD},
@@ skipping 19 matching lines @@
 
   if (id >= IDC_SPELLCHECK_SUGGESTION_0 &&
       id <= IDC_SPELLCHECK_SUGGESTION_LAST) {
     return IDC_SPELLCHECK_SUGGESTION_0;
   }
 
   return id;
 }
 
 // Returns UMA enum value for command specified by |id| or -1 if not found.
-int FindUMAEnumValueForCommand(int id) {
+// |use_specific_context_enum| set to true returns the context_specific_enum_id.
+int FindUMAEnumValueForCommand(int id, bool use_specific_context_enum) {

[Avi (use Gerrit), 2015/09/26 02:26:15]

This is a magic bool as a parameter that is impossible to grok meaning from. If
you don't want to split this into two functions, make a quick two-valued enum
and use that instead.

[edwardjung, 2015/09/28 14:11:25]

Understood. Changed to use an enum.

   if (RenderViewContextMenu::IsContentCustomCommandId(id))
     return 0;
 
   if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
     return 1;
 
   id = CollapseCommandsForUMA(id);
   const size_t kMappingSize = arraysize(kUmaEnumToControlId);
   for (size_t i = 0; i < kMappingSize; ++i) {
     if (kUmaEnumToControlId[i].control_id == id) {
-      return kUmaEnumToControlId[i].enum_id;
+      if (!use_specific_context_enum) {
+        return kUmaEnumToControlId[i].enum_id;
+      } else if (use_specific_context_enum &&
+        kUmaEnumToControlId[i].context_specific_enum_id > -1) {

[Avi (use Gerrit), 2015/09/26 02:26:15]

How could this ever not be true? In most of the list items above, you only
provide two initializers in the aggregate. In that case, that third value will
be default initialized to 0 (see the C++11 spec, [dcl.init.aggr], §8.5.1
Aggregates, ¶7). And given that all the values that you _do_ give are positive,
how could your clause "kUmaEnumToControlId[i].context_specific_enum_id" ever
_not_ be greater than -1?

Like I said above, make the two IDs the first two members, and explicitly give
all the values explicitly-specified ids. Even the ones you set to -1 or
whatever.

[edwardjung, 2015/09/28 14:11:25]

Understood. Fixed.

+        return kUmaEnumToControlId[i].context_specific_enum_id;
+      }
     }
   }
+
   return -1;
 }
 
 // Usually a new tab is expected where this function is used,
 // however users should be able to open a tab in background
 // or in a new window.
 WindowOpenDisposition ForceNewTabDispositionFromEventFlags(
     int event_flags) {
   WindowOpenDisposition disposition =
       ui::DispositionFromEventFlags(event_flags);
@@ skipping 51 matching lines @@
           : url_formatter::FormatUrl(
                 url, languages, url_formatter::kFormatUrlOmitNothing,
                 net::UnescapeRule::NONE, nullptr, nullptr, nullptr);
 
   ui::ScopedClipboardWriter scw(ui::CLIPBOARD_TYPE_COPY_PASTE);
   scw.WriteURL(text);
 }
 
 bool g_custom_id_ranges_initialized = false;
 
-const int kSpellcheckRadioGroup = 1;
-
 }  // namespace
 
 // static
 gfx::Vector2d RenderViewContextMenu::GetOffset(
     RenderFrameHost* render_frame_host) {
   gfx::Vector2d offset;
 #if defined(ENABLE_EXTENSIONS)
   WebContents* web_contents =
       WebContents::FromRenderFrameHost(render_frame_host);
   WebContents* top_level_web_contents =
@@ skipping 195 matching lines @@
                                         false /* is_action_menu */);
 }
 #endif  // defined(ENABLE_EXTENSIONS)
 
 void RenderViewContextMenu::InitMenu() {
   RenderViewContextMenuBase::InitMenu();
 
   if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PAGE))
     AppendPageItems();
 
-  if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_FRAME)) {
-    // Merge in frame items with page items if we clicked within a frame that
-    // needs them.
-    menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
-    AppendFrameItems();
-  }
-
   if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_LINK)) {
     AppendLinkItems();
     if (params_.media_type != WebContextMenuData::MediaTypeNone)
       menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   }
 
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_MEDIA_IMAGE)) {
     AppendImageItems();
   }
@@ skipping 32 matching lines @@
     DCHECK(!content_type_->SupportsGroup(
                ContextMenuContentType::ITEM_GROUP_EDITABLE));
     AppendCopyItem();
   }
 
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_SEARCH_PROVIDER)) {
     AppendSearchProvider();
   }
 
-  if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT))
+  if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT) &&
+      !content_type_->SupportsGroup(
+          ContextMenuContentType::ITEM_GROUP_MEDIA_IMAGE)) {
     AppendPrintItem();
+  }
+
+  if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_EDITABLE))
+      {
+      menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+      AppendPlatformEditableItems();
+      AppendLanguageSettings();
+    }

[Avi (use Gerrit), 2015/09/26 02:26:15]

Your indenting is wack; please fix.

[edwardjung, 2015/09/28 14:11:25]

Done.

 
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_MEDIA_PLUGIN)) {
     AppendRotationItems();
   }
 
   if (content_type_->SupportsGroup(
           ContextMenuContentType::ITEM_GROUP_ALL_EXTENSION)) {
     DCHECK(!content_type_->SupportsGroup(
                ContextMenuContentType::ITEM_GROUP_CURRENT_EXTENSION));
@@ skipping 26 matching lines @@
           ContextMenuContentType::ITEM_GROUP_PASSWORD)) {
     AppendPasswordItems();
   }
 }
 
 Profile* RenderViewContextMenu::GetProfile() {
   return Profile::FromBrowserContext(browser_context_);
 }
 
 void RenderViewContextMenu::RecordUsedItem(int id) {
-  int enum_id = FindUMAEnumValueForCommand(id);
+  int enum_id = FindUMAEnumValueForCommand(id, false);
   if (enum_id != -1) {
     const size_t kMappingSize = arraysize(kUmaEnumToControlId);
     UMA_HISTOGRAM_ENUMERATION("RenderViewContextMenu.Used", enum_id,
                               kUmaEnumToControlId[kMappingSize - 1].enum_id);
+    // Record to additional context specific histograms.
+    enum_id = FindUMAEnumValueForCommand(id, true);
+
+    // Linked image context.
+    if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_LINK) &&
+        content_type_->SupportsGroup(
+            ContextMenuContentType::ITEM_GROUP_MEDIA_IMAGE)) {
+      UMA_HISTOGRAM_ENUMERATION("ContextMenu.SelectedOption.ImageLink", enum_id,
+                                kUmaEnumToControlId[kMappingSize - 1].enum_id);
+    }
+    // Selected text context.
+    if (content_type_->SupportsGroup(
+        ContextMenuContentType::ITEM_GROUP_SEARCH_PROVIDER) &&
+        content_type_->SupportsGroup(
+        ContextMenuContentType::ITEM_GROUP_PRINT)) {

[Avi (use Gerrit), 2015/09/26 02:26:15]

Your indenting is weird; you should indent line 697 and 699. Or let clang-format
handle it.

[edwardjung, 2015/09/28 14:11:25]

Done.

+      UMA_HISTOGRAM_ENUMERATION("ContextMenu.SelectedOption.SelectedText",
+                                enum_id,
+                                kUmaEnumToControlId[kMappingSize - 1].enum_id);
+    }
   } else {
     NOTREACHED() << "Update kUmaEnumToControlId. Unhanded IDC: " << id;
   }
 }
 
 void RenderViewContextMenu::RecordShownItem(int id) {
-  int enum_id = FindUMAEnumValueForCommand(id);
+  int enum_id = FindUMAEnumValueForCommand(id, false);
   if (enum_id != -1) {
     const size_t kMappingSize = arraysize(kUmaEnumToControlId);
     UMA_HISTOGRAM_ENUMERATION("RenderViewContextMenu.Shown", enum_id,
                               kUmaEnumToControlId[kMappingSize - 1].enum_id);
   } else {
     // Just warning here. It's harder to maintain list of all possibly
     // visible items than executable items.
     DLOG(ERROR) << "Update kUmaEnumToControlId. Unhanded IDC: " << id;
   }
 }
@@ skipping 29 matching lines @@
 #if defined(DEBUG_DEVTOOLS)
   show_developer_items = true;
 #endif
 
   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);
+  // Page context source.
+  if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PAGE))
+    menu_model_.AddItemWithStringId(IDC_VIEW_SOURCE,
+                                    IDS_CONTENT_CONTEXT_VIEWPAGESOURCE);
+  // Frame context source.
+  if (content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_FRAME))
+    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE,
+                                    IDS_CONTENT_CONTEXT_VIEWFRAMESOURCE);

[Avi (use Gerrit), 2015/09/26 02:26:15]

Are these useful comments? I would say no.

[edwardjung, 2015/09/28 14:11:25]

Removed.

   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);
@@ skipping 21 matching lines @@
   }
 
   menu_model_.AddItemWithStringId(
       IDC_CONTENT_CONTEXT_COPYLINKLOCATION,
       params_.link_url.SchemeIs(url::kMailToScheme) ?
           IDS_CONTENT_CONTEXT_COPYEMAILADDRESS :
           IDS_CONTENT_CONTEXT_COPYLINKLOCATION);
 }
 
 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);
   std::map<std::string, std::string>::const_iterator it =
       params_.properties.find(data_reduction_proxy::chrome_proxy_header());
   if (it != params_.properties.end() && it->second ==
       data_reduction_proxy::chrome_proxy_lo_fi_directive()) {
     menu_model_.AddItemWithStringId(
         IDC_CONTENT_CONTEXT_LOAD_ORIGINAL_IMAGE,
         IDS_CONTENT_CONTEXT_LOAD_ORIGINAL_IMAGE);
   }
   DataReductionProxyChromeSettings* settings =
       DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
           browser_context_);
   if (settings && settings->CanUseDataReductionProxy(params_.src_url)) {
     menu_model_.AddItemWithStringId(
         IDC_CONTENT_CONTEXT_OPEN_ORIGINAL_IMAGE_NEW_TAB,
         IDS_CONTENT_CONTEXT_OPEN_ORIGINAL_IMAGE_NEW_TAB);
   } else {
     menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB,
                                     IDS_CONTENT_CONTEXT_OPENIMAGENEWTAB);
   }
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEIMAGEAS,
+                                  IDS_CONTENT_CONTEXT_SAVEIMAGEAS);
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYIMAGE,
+                                  IDS_CONTENT_CONTEXT_COPYIMAGE);
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYIMAGELOCATION,
+                                  IDS_CONTENT_CONTEXT_COPYIMAGELOCATION);
 }
 
 void RenderViewContextMenu::AppendSearchWebForImageItems() {
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(GetProfile());
   const TemplateURL* const default_provider =
       service->GetDefaultSearchProvider();
   if (params_.has_image_contents && default_provider &&
       !default_provider->image_url().empty() &&
       default_provider->image_url_ref().IsValid(service->search_terms_data())) {
     menu_model_.AddItem(
         IDC_CONTENT_CONTEXT_SEARCHWEBFORIMAGE,
         l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_SEARCHWEBFORIMAGE,
                                    default_provider->short_name()));
   }
 }
 
 void RenderViewContextMenu::AppendAudioItems() {
-  AppendMediaItems();
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENAVNEWTAB,
+                                  IDS_CONTENT_CONTEXT_OPENAUDIONEWTAB);
   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,
-                                  IDS_CONTENT_CONTEXT_OPENAUDIONEWTAB);
 }
 
 void RenderViewContextMenu::AppendCanvasItems() {
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEIMAGEAS,
                                   IDS_CONTENT_CONTEXT_SAVEIMAGEAS);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYIMAGE,
                                   IDS_CONTENT_CONTEXT_COPYIMAGE);
 }
 
 void RenderViewContextMenu::AppendVideoItems() {
-  AppendMediaItems();
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENAVNEWTAB,
+                                  IDS_CONTENT_CONTEXT_OPENVIDEONEWTAB);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEAVAS,
                                   IDS_CONTENT_CONTEXT_SAVEVIDEOAS);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYAVLOCATION,
                                   IDS_CONTENT_CONTEXT_COPYVIDEOLOCATION);
-  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENAVNEWTAB,
-                                  IDS_CONTENT_CONTEXT_OPENVIDEONEWTAB);
-}
-
-void RenderViewContextMenu::AppendMediaItems() {
-  int media_flags = params_.media_flags;
-
-  menu_model_.AddItemWithStringId(
-      IDC_CONTENT_CONTEXT_PLAYPAUSE,
-      media_flags & WebContextMenuData::MediaPaused ?
-          IDS_CONTENT_CONTEXT_PLAY :
-          IDS_CONTENT_CONTEXT_PAUSE);
-
-  menu_model_.AddItemWithStringId(
-      IDC_CONTENT_CONTEXT_MUTE,
-      media_flags & WebContextMenuData::MediaMuted ?
-          IDS_CONTENT_CONTEXT_UNMUTE :
-          IDS_CONTENT_CONTEXT_MUTE);
-
-  menu_model_.AddCheckItemWithStringId(IDC_CONTENT_CONTEXT_LOOP,
-                                       IDS_CONTENT_CONTEXT_LOOP);
-  menu_model_.AddCheckItemWithStringId(IDC_CONTENT_CONTEXT_CONTROLS,
-                                       IDS_CONTENT_CONTEXT_CONTROLS);
 }
 
 void RenderViewContextMenu::AppendPluginItems() {
   if (params_.page_url == params_.src_url ||
       guest_view::GuestViewBase::IsGuest(source_web_contents_)) {
     // Full page plugin, so show page menu items.
     if (params_.link_url.is_empty() && params_.selection_text.empty())
       AppendPageItems();
   } else {
     menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEAVAS,
@@ skipping 18 matching lines @@
 
   if (TranslateService::IsTranslatableURL(params_.page_url)) {
     std::string locale = g_browser_process->GetApplicationLocale();
     locale = translate::TranslateDownloadManager::GetLanguageCode(locale);
     base::string16 language =
         l10n_util::GetDisplayNameForLocale(locale, locale, true);
     menu_model_.AddItem(
         IDC_CONTENT_CONTEXT_TRANSLATE,
         l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
   }
-
-  menu_model_.AddItemWithStringId(IDC_VIEW_SOURCE,
-                                  IDS_CONTENT_CONTEXT_VIEWPAGESOURCE);
-  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_VIEWPAGEINFO,
-                                  IDS_CONTENT_CONTEXT_VIEWPAGEINFO);
-}
-
-void RenderViewContextMenu::AppendFrameItems() {
-  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_RELOADFRAME,
-                                  IDS_CONTENT_CONTEXT_RELOADFRAME);
-  // These two menu items have yet to be implemented.
-  // http://code.google.com/p/chromium/issues/detail?id=11827
-  //   IDS_CONTENT_CONTEXT_SAVEFRAMEAS
-  //   IDS_CONTENT_CONTEXT_PRINTFRAME
-  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE,
-                                  IDS_CONTENT_CONTEXT_VIEWFRAMESOURCE);
-  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_VIEWFRAMEINFO,
-                                  IDS_CONTENT_CONTEXT_VIEWFRAMEINFO);
 }
 
 void RenderViewContextMenu::AppendCopyItem() {
+  if (menu_model_.GetItemCount())
+    menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPY,
                                   IDS_CONTENT_CONTEXT_COPY);
 }
 
 void RenderViewContextMenu::AppendPrintItem() {
   if (GetPrefs(browser_context_)->GetBoolean(prefs::kPrintingEnabled) &&
       (params_.media_type == WebContextMenuData::MediaTypeNone ||
        params_.media_flags & WebContextMenuData::MediaCanPrint)) {
     menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
   }
@@ skipping 57 matching lines @@
     }
   }
 }
 
 void RenderViewContextMenu::AppendEditableItems() {
   const bool use_spellcheck_and_search = !chrome::IsRunningInForcedAppMode();
 
   if (use_spellcheck_and_search)
     AppendSpellingSuggestionsSubMenu();
 
-  if (!IsDevToolsURL(params_.page_url)) {
+  // 'Undo' and 'Redo' for tText input with no suggestions and no text selected.

[Avi (use Gerrit), 2015/09/26 02:26:15]

typo: tText

[edwardjung, 2015/09/28 14:11:25]

Done.

+  // We make an exception for OSX as context clicking will select the closest

[Avi (use Gerrit), 2015/09/26 02:26:15]

s/OSX/Mac OS X/ or /OS X/ or /the Mac/

[edwardjung, 2015/09/28 14:11:25]

Done.

+  // word. In this case both items are always shown.
+#if defined(OS_MACOSX)
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO,
+                                  IDS_CONTENT_CONTEXT_UNDO);
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO,
+                                  IDS_CONTENT_CONTEXT_REDO);
+  menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+#else
+  if (!IsDevToolsURL(params_.page_url) &&
+      !menu_model_.GetItemCount() &&
+      !content_type_->SupportsGroup(ContextMenuContentType::ITEM_GROUP_PRINT)) {
     menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO,
                                     IDS_CONTENT_CONTEXT_UNDO);
     menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO,
                                     IDS_CONTENT_CONTEXT_REDO);
     menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   }
+#endif
 
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_CUT,
                                   IDS_CONTENT_CONTEXT_CUT);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPY,
                                   IDS_CONTENT_CONTEXT_COPY);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_PASTE,
                                   IDS_CONTENT_CONTEXT_PASTE);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE,
                                   IDS_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE);
-  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_DELETE,
-                                  IDS_CONTENT_CONTEXT_DELETE);
-  menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
-
-  if (use_spellcheck_and_search && !params_.keyword_url.is_empty()) {
-    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_ADDSEARCHENGINE,
-                                    IDS_CONTENT_CONTEXT_ADDSEARCHENGINE);
-    menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
-  }
-
-#if defined(OS_MACOSX)
-  if (use_spellcheck_and_search)
-    AppendSpellcheckOptionsSubMenu();
-#else
-  if (chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) {
-    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
-                                    IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
-  } else if (use_spellcheck_and_search) {
-    AppendSpellcheckOptionsSubMenu();
-  }
-#endif  // defined(OS_MACOSX)
-
-  AppendPlatformEditableItems();
+  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SELECTALL,
+                                  IDS_CONTENT_CONTEXT_SELECTALL);
 
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
-  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SELECTALL,
-                                  IDS_CONTENT_CONTEXT_SELECTALL);
+}
+
+void RenderViewContextMenu::AppendLanguageSettings() {
+  const bool use_spellcheck_and_search = !chrome::IsRunningInForcedAppMode();
+
+  if (use_spellcheck_and_search)
+    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
+                                  IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
 }
 
 void RenderViewContextMenu::AppendSpellingSuggestionsSubMenu() {
   if (!spelling_menu_observer_.get())
     spelling_menu_observer_.reset(new SpellingMenuObserver(this));
   observers_.AddObserver(spelling_menu_observer_.get());
   spelling_menu_observer_->InitMenu(params_);
 }
 
-void RenderViewContextMenu::AppendSpellcheckOptionsSubMenu() {
-  if (!spellchecker_submenu_observer_.get()) {
-    spellchecker_submenu_observer_.reset(new SpellCheckerSubMenuObserver(
-        this, this, kSpellcheckRadioGroup));
-  }
-  spellchecker_submenu_observer_->InitMenu(params_);
-  observers_.AddObserver(spellchecker_submenu_observer_.get());
-}
-
 void RenderViewContextMenu::AppendProtocolHandlerSubMenu() {
   const ProtocolHandlerRegistry::ProtocolHandlerList handlers =
       GetHandlersForLinkUrl();
   if (handlers.empty())
     return;
   size_t max = IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_LAST -
       IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST;
   for (size_t i = 0; i < handlers.size() && i <= max; i++) {
     protocol_handler_submenu_model_.AddItem(
         IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST + i,
@@ skipping 892 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);
 }