Fixes bug 1925 (context menus for text selections in...

chrome/browser/render_view_context_menu.cc

 // Copyright (c) 2006-2008 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/render_view_context_menu.h"
 
 #include "base/logging.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/common/l10n_util.h"
 #include "webkit/glue/context_node_types.h"
 
 #include "generated_resources.h"
 
 RenderViewContextMenu::RenderViewContextMenu(
     Menu::Delegate* delegate,
     HWND owner,
-    ContextNode::Type type,
+    ContextNode node,
     const std::wstring& misspelled_word,
     const std::vector<std::wstring>& misspelled_word_suggestions,
     Profile* profile)
     : Menu(delegate, Menu::TOPLEFT, owner),
       misspelled_word_(misspelled_word),
       misspelled_word_suggestions_(misspelled_word_suggestions),
       profile_(profile) {
-  InitMenu(type);
+  InitMenu(node);
 }
 
 RenderViewContextMenu::~RenderViewContextMenu() {
 }
 
-void RenderViewContextMenu::InitMenu(ContextNode::Type type) {
-  switch (type) {
-   case ContextNode::PAGE:
+void RenderViewContextMenu::InitMenu(ContextNode node) {
+  if (node.type & ContextNode::PAGE)
     AppendPageItems();
-    break;
-   case ContextNode::FRAME:
+  if (node.type & ContextNode::FRAME)
     AppendFrameItems();
-    break;
-   case ContextNode::LINK:
+  if (node.type & ContextNode::LINK)
     AppendLinkItems();
-    break;
-   case ContextNode::IMAGE:
+
+  if (node.type & ContextNode::IMAGE) {
+    if (node.type & ContextNode::LINK)
+      AppendSeparator();
     AppendImageItems();
-    break;
-   case ContextNode::IMAGE_LINK:
-    AppendLinkItems();
-    AppendSeparator();
-    AppendImageItems();
-    break;
-   case ContextNode::SELECTION:
-    AppendSelectionItems();
-    break;
-   case ContextNode::EDITABLE:
+  }
+
+  if (node.type & ContextNode::EDITABLE)
     AppendEditableItems();
-    break;
-   default:
-    NOTREACHED() << "Unknown ContextNode::Type";
-  }
+  else if (node.type & ContextNode::SELECTION ||
+           node.type & ContextNode::LINK)
+    AppendCopyItem();
+
+  if (node.type & ContextNode::SELECTION)
+    AppendSearchProvider();
   AppendSeparator();
   AppendDeveloperItems();
 }
 
 void RenderViewContextMenu::AppendDeveloperItems() {
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_INSPECTELEMENT);
 }
 
 void RenderViewContextMenu::AppendLinkItems() {
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_OPENLINKNEWTAB);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_OPENLINKNEWWINDOW);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_SAVELINKAS);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_COPYLINKLOCATION);
-  AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_COPY);
 }
 
 void RenderViewContextMenu::AppendImageItems() {
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_SAVEIMAGEAS);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_COPYIMAGELOCATION);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_COPYIMAGE);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_OPENIMAGENEWTAB);
 }
 
 void RenderViewContextMenu::AppendPageItems() {
@@ skipping 14 matching lines @@
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_OPENFRAMENEWTAB);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_OPENFRAMENEWWINDOW);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_OPENFRAMEOFFTHERECORD);
   AppendSeparator();
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_SAVEFRAMEAS);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_PRINTFRAME);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_VIEWFRAMESOURCE);
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_VIEWFRAMEINFO);
 }
 
-void RenderViewContextMenu::AppendSelectionItems() {
+void RenderViewContextMenu::AppendCopyItem() {
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_COPY);
+}
+
+void RenderViewContextMenu::AppendSearchProvider() {
   DCHECK(profile_);
   if (profile_->GetTemplateURLModel()->GetDefaultSearchProvider() != NULL)
     AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_SEARCHWEBFOR);
 }
 
 void RenderViewContextMenu::AppendEditableItems() {
   // Append Dictionary spell check suggestions.
   for (size_t i = 0; i < misspelled_word_suggestions_.size() &&
        IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
        i ++) {
@@ skipping 47 matching lines @@
 
   // Add 'Check the spelling of this field' item in the sub menu.
   spellchecker_sub_menu_->AppendMenuItem(
       IDC_CHECK_SPELLING_OF_THIS_FIELD,
       l10n_util::GetString(IDS_CONTENT_CONTEXT_CHECK_SPELLING_OF_THIS_FIELD),
       CHECKBOX);
 
   AppendSeparator();
   AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_SELECTALL);
 }