Context menu item to view original image when Data Saver is being used.

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 13 matching lines @@
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/extensions/devtools_util.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/renderer_context_menu/context_menu_content_type_factory.h"
 #include "chrome/browser/renderer_context_menu/spellchecker_submenu_observer.h"
 #include "chrome/browser/renderer_context_menu/spelling_menu_observer.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
@@ skipping 158 matching lines @@
       {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},
       {59, IDC_SPELLCHECK_ADD_TO_DICTIONARY},
       {60, IDC_SPELLPANEL_TOGGLE},
+      {61, IDC_CONTENT_CONTEXT_OPENORIGINALIMAGENEWTAB},
       // Add new items here and use |enum_id| from the next line.
-      {61, 0},  // Must be the last. Increment |enum_id| when new IDC was added.
+      {62, 0},  // Must be the last. Increment |enum_id| when new IDC was added.
 };
 
 // Collapses large ranges of ids before looking for UMA enum.
 int CollapseCommandsForUMA(int id) {
   DCHECK(!RenderViewContextMenu::IsContentCustomCommandId(id));
   DCHECK(!ContextMenuMatcher::IsExtensionsCustomCommandId(id));
 
   if (id >= IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST &&
       id <= IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_LAST) {
     return IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST;
@@ skipping 461 matching lines @@
           IDS_CONTENT_CONTEXT_COPYLINKLOCATION);
 }
 
 void RenderViewContextMenu::AppendImageItems() {
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_SAVEIMAGEAS,
                                   IDS_CONTENT_CONTEXT_SAVEIMAGEAS);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYIMAGELOCATION,
                                   IDS_CONTENT_CONTEXT_COPYIMAGELOCATION);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_COPYIMAGE,
                                   IDS_CONTENT_CONTEXT_COPYIMAGE);
-  menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB,
-                                  IDS_CONTENT_CONTEXT_OPENIMAGENEWTAB);
+  if (!browser_context_->IsOffTheRecord() &&
+    DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
+        browser_context_)->CanUseDataReductionProxy(
+            params_.src_url)) {
+    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENORIGINALIMAGENEWTAB,
+        IDS_CONTENT_CONTEXT_OPENORIGINALIMAGENEWTAB);
+  } else {
+    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB,
+                                    IDS_CONTENT_CONTEXT_OPENIMAGENEWTAB);
+  }
 }
 
 void RenderViewContextMenu::AppendSearchWebForImageItems() {
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(GetProfile());
   const TemplateURL* const default_provider =
       service->GetDefaultSearchProvider();
   if (params_.has_image_contents && default_provider &&
       !default_provider->image_url().empty() &&
       default_provider->image_url_ref().IsValid(service->search_terms_data())) {
@@ skipping 388 matching lines @@
       DCHECK(local_state);
       // Test if file-selection dialogs are forbidden by policy.
       if (!local_state->GetBoolean(prefs::kAllowFileSelectionDialogs))
         return false;
 
       return params_.has_image_contents;
     }
 
     // The images shown in the most visited thumbnails can't be opened or
     // searched for conventionally.
+    case IDC_CONTENT_CONTEXT_OPENORIGINALIMAGENEWTAB:
     case IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB:
     case IDC_CONTENT_CONTEXT_SEARCHWEBFORIMAGE:
       return params_.src_url.is_valid() &&
           (params_.src_url.scheme() != content::kChromeUIScheme);
 
     case IDC_CONTENT_CONTEXT_COPYIMAGE:
       return params_.has_image_contents;
 
     // Media control commands should all be disabled if the player is in an
     // error state.
@@ skipping 278 matching lines @@
       break;
 
     case IDC_CONTENT_CONTEXT_COPYIMAGE:
       CopyImageAt(params_.x, params_.y);
       break;
 
     case IDC_CONTENT_CONTEXT_SEARCHWEBFORIMAGE:
       GetImageThumbnailForSearch();
       break;
 
+    case IDC_CONTENT_CONTEXT_OPENORIGINALIMAGENEWTAB:
+      OpenURL(params_.src_url,
+              GetDocumentURL(params_),
+              NEW_BACKGROUND_TAB,
+              ui::PAGE_TRANSITION_LINK,
+              "X-PSA-Client-Options: v=1,m=1\nCache-Control: no-cache");

[Alexei Svitkine (slow), 2015/02/20 18:37:27]

Hardcoding this string in context menu code is bad - it shouldn't have to know
about this thing.

Can a utility function be added somewhere more appropriate (in data reduction
proxy code) that this calls?

[Not at Google. Contact bengr, 2015/02/21 00:11:16]

Moved the string to drp_settings. The OpenUrl(..) method is specific to context
menu so cannot move that call.

+      break;
+
     case IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB:
     case IDC_CONTENT_CONTEXT_OPENAVNEWTAB:
       OpenURL(params_.src_url,
               GetDocumentURL(params_),
               NEW_BACKGROUND_TAB,
               ui::PAGE_TRANSITION_LINK);
       break;
 
     case IDC_CONTENT_CONTEXT_PLAYPAUSE: {
       bool play = !!(params_.media_flags & WebContextMenuData::MediaPaused);
@@ skipping 372 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);
 }