Record RenderViewContextMenu.Used histogram for commands handled by observers.

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 187 matching lines @@
   { 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 },
+  { 58, IDC_SPELLCHECK_SUGGESTION_0 },
   // Add new items here and use |enum_id| from the next line.
-  { 58, 0 },  // Must be the last. Increment |enum_id| when new IDC was added.
+  { 59, 0 },  // Must be the last. Increment |enum_id| when new IDC was added.
 };
 
 // Collapses large ranges of ids before looking for UMA enum.
 int CollapleCommandsForUMA(int id) {
   if (id >= IDC_CONTENT_CONTEXT_CUSTOM_FIRST &&
       id <= IDC_CONTENT_CONTEXT_CUSTOM_LAST) {
     return IDC_CONTENT_CONTEXT_CUSTOM_FIRST;
   }
 
   if (id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST &&
       id <= IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST) {
     return IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST;
   }
 
   if (id >= IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST &&
       id <= IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_LAST) {
     return IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST;
   }
 
   if (id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
       id <= IDC_SPELLCHECK_LANGUAGES_LAST) {
     return IDC_SPELLCHECK_LANGUAGES_FIRST;
   }
 
+  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) {
   id = CollapleCommandsForUMA(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;
@@ skipping 1165 matching lines @@
   if (id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST &&
       id <= IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST) {
     return extension_items_.IsCommandIdChecked(id);
   }
 
   return false;
 }
 
 void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
   command_executed_ = true;
+  RecordUsedItem(id);
+
   // If this command is is added by one of our observers, we dispatch it to the
   // observer.
   ObserverListBase<RenderViewContextMenuObserver>::Iterator it(observers_);
   RenderViewContextMenuObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     if (observer->IsCommandIdSupported(id))
       return observer->ExecuteCommand(id);
   }
 
-  RecordUsedItem(id);
-
   RenderFrameHost* render_frame_host =
       RenderFrameHost::FromID(render_process_id_, render_frame_id_);
 
   // Process custom actions range.
   if (id >= IDC_CONTENT_CONTEXT_CUSTOM_FIRST &&
       id <= IDC_CONTENT_CONTEXT_CUSTOM_LAST) {
     unsigned action = id - IDC_CONTENT_CONTEXT_CUSTOM_FIRST;
     const content::CustomContextMenuContext& context = params_.custom_context;
 #if defined(ENABLE_PLUGINS)
     if (context.request_id && !context.is_pepper_menu) {
@@ skipping 547 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);
 }