added CTRL+Click and SHIFT+Click handler for context menu, Back and Forward.

chrome/browser/tab_contents/render_view_context_menu.cc

 // Copyright (c) 2011 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 <algorithm>
 #include <set>
 
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include "base/command_line.h"
@@ skipping 22 matching lines @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/spellcheck_host.h"
 #include "chrome/browser/spellchecker_platform_engine.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/ui/browser_back_forward_navigator.h"
 #include "chrome/browser/ui/download/download_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/content_restriction.h"
 #include "content/common/view_messages.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/favicon_size.h"
 #include "webkit/glue/webmenuitem.h"
+#include "webkit/glue/window_open_disposition.h"
 
 using WebKit::WebContextMenuData;
 using WebKit::WebMediaPlayerAction;
 using WebKit::WebURL;
 using WebKit::WebString;
 
 namespace {
 
 bool IsCustomItemEnabled(const std::vector<WebMenuItem>& items, int id) {
   DCHECK(id >= IDC_CONTENT_CONTEXT_CUSTOM_FIRST &&
@@ skipping 1115 matching lines @@
   // language.
   if ((id < IDC_SPELLCHECK_LANGUAGES_FIRST) ||
       (id >= IDC_SPELLCHECK_LANGUAGES_LAST))
     return false;
 
   std::vector<std::string> languages;
   return SpellCheckHost::GetSpellCheckLanguages(profile_, &languages) ==
       (id - IDC_SPELLCHECK_LANGUAGES_FIRST);
 }
 
+void RenderViewContextMenu::ExecuteCommandWithFlags(int id, int flags) {
+  switch (id) {
+    case IDC_BACK: {

[Ben Goodger (Google), 2011/05/31 16:00:00]

A general note. It seems weird to me that the context menu handles commands that
don't depend on contextual data locally. It feels like the only TCW delegate
method should be "here's a command (maybe with flags) that I didn't handle,
delegate, figure it out!"

See also all the functions in ExecuteCommand() below that don't use |params_|.

[shinyak (Google), 2011/06/09 02:29:04]

I've changed these so that they just call a function.

On 2011/05/31 16:00:00, Ben Goodger wrote:

+      TabContentsWrapper* wrapper =
+          TabContentsWrapper::GetCurrentWrapperForContents(
+              source_tab_contents_);
+      browser::BrowserBackForwardNavigator::GoBack(
+          wrapper->delegate(), flags);
+      return;
+    }
+    case IDC_FORWARD: {
+      TabContentsWrapper* wrapper =
+          TabContentsWrapper::GetCurrentWrapperForContents(
+              source_tab_contents_);
+      browser::BrowserBackForwardNavigator::GoForward(
+          wrapper->delegate(), flags);
+      return;
+    }
+  }
+
+  // If not processed, call ExecuteCommand instead.
+  ExecuteCommand(id);
+}
+
 void RenderViewContextMenu::ExecuteCommand(int id) {
   // Check to see if one of the spell check language ids have been clicked.
   if (id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
       id < IDC_SPELLCHECK_LANGUAGES_LAST) {
     const size_t language_number = id - IDC_SPELLCHECK_LANGUAGES_FIRST;
     std::vector<std::string> languages;
     SpellCheckHost::GetSpellCheckLanguages(profile_, &languages);
     if (language_number < languages.size()) {
       StringPrefMember dictionary_language;
       dictionary_language.Init(prefs::kSpellCheckDictionary,
@@ skipping 428 matching lines @@
       g_browser_process->clipboard());
 }
 
 void RenderViewContextMenu::MediaPlayerActionAt(
     const gfx::Point& location,
     const WebMediaPlayerAction& action) {
   RenderViewHost* rvh = source_tab_contents_->render_view_host();
   rvh->Send(new ViewMsg_MediaPlayerActionAt(
       rvh->routing_id(), location, action));
 }