Requesting Review for BugFix Chromium:1935

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 34 matching lines @@
 #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/url_constants.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 "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/favicon_size.h"
 #include "webkit/glue/webmenuitem.h"
 
 using WebKit::WebContextMenuData;
 using WebKit::WebMediaPlayerAction;
+using WebKit::WebSecurityPolicy;
+using WebKit::WebURL;
+using WebKit::WebString;
 
 namespace {
 
 bool IsCustomItemEnabled(const std::vector<WebMenuItem>& items, int id) {
   DCHECK(id >= IDC_CONTENT_CONTEXT_CUSTOM_FIRST &&
          id <= IDC_CONTENT_CONTEXT_CUSTOM_LAST);
   for (size_t i = 0; i < items.size(); ++i) {
     int action_id = IDC_CONTENT_CONTEXT_CUSTOM_FIRST + items[i].action;
     if (action_id == id)
       return items[i].enabled;
@@ skipping 1095 matching lines @@
     if (i != extension_item_map_.end()) {
       manager->ExecuteCommand(profile_, source_tab_contents_, params_,
                               i->second);
     }
     return;
   }
 
 
   switch (id) {
     case IDC_CONTENT_CONTEXT_OPENLINKNEWTAB:
-      OpenURL(params_.link_url,
-              source_tab_contents_->delegate() &&
+      OpenURL(
+          params_.link_url,
+          params_.frame_url.is_empty() ? params_.page_url : params_.frame_url,
+          source_tab_contents_->delegate() &&
               source_tab_contents_->delegate()->IsApplication() ?
                   NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB,
-              PageTransition::LINK);
+          PageTransition::LINK);
       break;
 
     case IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW:
-      OpenURL(params_.link_url, NEW_WINDOW, PageTransition::LINK);
+      OpenURL(
+          params_.link_url,
+          params_.frame_url.is_empty() ? params_.page_url : params_.frame_url,
+          NEW_WINDOW, PageTransition::LINK);
       break;
 
     case IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD:
-      OpenURL(params_.link_url, OFF_THE_RECORD, PageTransition::LINK);
+      OpenURL(params_.link_url, GURL(), OFF_THE_RECORD, PageTransition::LINK);
       break;
 
     case IDC_CONTENT_CONTEXT_SAVEAVAS:
     case IDC_CONTENT_CONTEXT_SAVEIMAGEAS:
     case IDC_CONTENT_CONTEXT_SAVELINKAS: {
       const GURL& referrer =
           params_.frame_url.is_empty() ? params_.page_url : params_.frame_url;
       const GURL& url =
           (id == IDC_CONTENT_CONTEXT_SAVELINKAS ? params_.link_url :
                                                   params_.src_url);
@@ skipping 11 matching lines @@
     case IDC_CONTENT_CONTEXT_COPYAVLOCATION:
       WriteURLToClipboard(params_.src_url);
       break;
 
     case IDC_CONTENT_CONTEXT_COPYIMAGE:
       CopyImageAt(params_.x, params_.y);
       break;
 
     case IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB:
     case IDC_CONTENT_CONTEXT_OPENAVNEWTAB:
-      OpenURL(params_.src_url, NEW_BACKGROUND_TAB, PageTransition::LINK);
+      OpenURL(
+          params_.src_url,
+          params_.frame_url.is_empty() ? params_.page_url : params_.frame_url,
+          NEW_BACKGROUND_TAB, PageTransition::LINK);
       break;
 
     case IDC_CONTENT_CONTEXT_PLAYPAUSE: {
       bool play = !!(params_.media_flags & WebContextMenuData::MediaPaused);
       if (play) {
         UserMetrics::RecordAction(UserMetricsAction("MediaContextMenu_Play"),
                                   profile_);
       } else {
         UserMetrics::RecordAction(UserMetricsAction("MediaContextMenu_Pause"),
                                   profile_);
@@ skipping 100 matching lines @@
           source_tab_contents_, original_lang, target_lang);
       break;
     }
 
     case IDC_CONTENT_CONTEXT_RELOADFRAME:
       source_tab_contents_->render_view_host()->ReloadFrame();
       break;
 
     case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE:
       OpenURL(GURL(chrome::kViewSourceScheme + std::string(":") +
-          params_.frame_url.spec()), NEW_FOREGROUND_TAB, PageTransition::LINK);
+          params_.frame_url.spec()), GURL(),
+          NEW_FOREGROUND_TAB, PageTransition::LINK);
       break;
 
     case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: {
       // Deserialize the SSL info.
       NavigationEntry::SSLStatus ssl;
       if (!params_.security_info.empty()) {
         int cert_id, cert_status, security_bits, connection_status;
         SSLManager::DeserializeSecurityInfo(params_.security_info,
                                             &cert_id,
                                             &cert_status,
@@ skipping 32 matching lines @@
     case IDC_CONTENT_CONTEXT_DELETE:
       source_tab_contents_->render_view_host()->Delete();
       break;
 
     case IDC_CONTENT_CONTEXT_SELECTALL:
       source_tab_contents_->render_view_host()->SelectAll();
       break;
 
     case IDC_CONTENT_CONTEXT_SEARCHWEBFOR:
     case IDC_CONTENT_CONTEXT_GOTOURL: {
-      OpenURL(selection_navigation_url_, NEW_FOREGROUND_TAB,
+      OpenURL(selection_navigation_url_, GURL(), NEW_FOREGROUND_TAB,
               PageTransition::LINK);
       break;
     }
 
     case IDC_SPELLCHECK_SUGGESTION_0:
     case IDC_SPELLCHECK_SUGGESTION_1:
     case IDC_SPELLCHECK_SUGGESTION_2:
     case IDC_SPELLCHECK_SUGGESTION_3:
     case IDC_SPELLCHECK_SUGGESTION_4:
       source_tab_contents_->render_view_host()->Replace(
@@ skipping 96 matching lines @@
 }
 
 string16 RenderViewContextMenu::PrintableSelectionText() {
   return l10n_util::TruncateString(params_.selection_text,
                                    kMaxSelectionTextLength);
 }
 
 // Controller functions --------------------------------------------------------
 
 void RenderViewContextMenu::OpenURL(
-    const GURL& url,
+    const GURL& url, const GURL& referrer,
     WindowOpenDisposition disposition,
     PageTransition::Type transition) {
-  source_tab_contents_->OpenURL(url, GURL(), disposition, transition);
+  // Check security policy to prevent referrer being sent
+  // in https to http transition.
+  bool hide_referrer = WebSecurityPolicy::shouldHideReferrer(

[darin (slow to review), 2011/04/13 16:38:32]

we try to avoid using webkit on the main thread of the browser process.  can we
avoid doing so here as well?

won't webkit prune out the referrer automagically using the exact same
machinery?  maybe this code isn't necessary?

[brettw, 2011/04/13 17:43:20]

I don't see this getting called in the new tab case in my testing, so we need to
add this call somewhere. Do we need a WebKit patch to add that, or is this call
here OK?

+      WebURL::WebURL(url),
+      WebString::fromUTF8(WebURL::WebURL(referrer).spec()));
+  source_tab_contents_->OpenURL(url, hide_referrer ? GURL() : referrer,
+                                disposition, transition);
 }
 
 void RenderViewContextMenu::CopyImageAt(int x, int y) {
   source_tab_contents_->render_view_host()->CopyImageAt(x, y);
 }
 
 void RenderViewContextMenu::Inspect(int x, int y) {
   UserMetrics::RecordAction(UserMetricsAction("DevTools_InspectElement"),
                             profile_);
   DevToolsManager::GetInstance()->InspectElement(
       source_tab_contents_->render_view_host(), x, y);
 }
 
 void RenderViewContextMenu::WriteURLToClipboard(const GURL& url) {
   chrome_browser_net::WriteURLToClipboard(
       url,
       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);
 }