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 23 matching lines @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile.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.h"

[brettw, 2011/04/28 20:43:39]

You can see we've been careful to never call into the browser from the existing
code in this file, because the TabContents layer is at a lower level of
abstraction.

Now that the actual TabContents object has moved out into it's own even-lower
level, it no longer makes sense to call into the TabContentsDelegate just to
call back into the browser (this is what we would have done with your patch
before TabContents moved).

Instead, we should use the TabContentsWrapperDelegate for this, which is
imlpemented by the browser. You can see some code in this file uses the
TabContentsWrapper and it has an easy delegate() getter.

+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/download/download_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_restriction.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/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request.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 1075 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::ExecuteCommandWithDisposition(

[brettw, 2011/04/28 20:43:39]

Be sure the implementation order matches the header (this should go below
ExecuteCommand).

I wonder if it would be cleaner to have all of the command handling in this
version and have ExecuteCommand just forward here with a disposition of
CURRENT_TAB. Would that mean there's less code?

+    int id, WindowOpenDisposition disposition) {
+
+  switch (id) {
+    case IDC_BACK: {
+      Profile* profile = source_tab_contents_->profile();
+      Browser* browser =
+          BrowserList::FindBrowserWithType(profile,
+                                           Browser::TYPE_NORMAL, false);
+      if (browser) {
+        browser->GoBack(disposition);
+        return;
+      }
+    }
+    case IDC_FORWARD: {
+      Profile* profile = source_tab_contents_->profile();
+      Browser* browser =
+          BrowserList::FindBrowserWithType(profile,
+                                           Browser::TYPE_NORMAL, false);
+      if (browser) {
+        browser->GoForward(disposition);
+        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 413 matching lines @@
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
       g_browser_process->clipboard());
 }
 
 void RenderViewContextMenu::MediaPlayerActionAt(
     const gfx::Point& location,
     const WebMediaPlayerAction& action) {
   source_tab_contents_->render_view_host()->MediaPlayerActionAt(
       location, action);
 }