Fix for Incomplete context menu shown in PDF.

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 69 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/menu_item.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/common/url_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/extension.h"
 #include "net/base/escape.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
 #include "third_party/WebKit/public/web/WebMediaPlayerAction.h"
 #include "third_party/WebKit/public/web/WebPluginAction.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/favicon_size.h"
@@ skipping 189 matching lines @@
 
 content::Referrer CreateSaveAsReferrer(
     const GURL& url,
     const content::ContextMenuParams& params) {
   const GURL& referring_url = GetDocumentURL(params);
   return content::Referrer::SanitizeForRequest(
       url,
       content::Referrer(referring_url.GetAsReferrer(), params.referrer_policy));
 }
 
+content::WebContents* GetWebContentsToUse(content::WebContents* web_contents) {
+  // If we're viewing in a MimeHandlerViewGuest, use its embedder WebContents.
+  auto guest_view =
+      extensions::MimeHandlerViewGuest::FromWebContents(web_contents);
+  if (guest_view)
+    return guest_view->embedder_web_contents();
+  return web_contents;
+}
+
 bool g_custom_id_ranges_initialized = false;
 
 const int kSpellcheckRadioGroup = 1;
 
 }  // namespace
 
 // static
 bool RenderViewContextMenu::IsDevToolsURL(const GURL& url) {
   return url.SchemeIs(content::kChromeDevToolsScheme);
 }
@@ skipping 446 matching lines @@
           IDS_CONTENT_CONTEXT_UNMUTE :
           IDS_CONTENT_CONTEXT_MUTE);
 
   menu_model_.AddCheckItemWithStringId(IDC_CONTENT_CONTEXT_LOOP,
                                        IDS_CONTENT_CONTEXT_LOOP);
   menu_model_.AddCheckItemWithStringId(IDC_CONTENT_CONTEXT_CONTROLS,
                                        IDS_CONTENT_CONTEXT_CONTROLS);
 }
 
 void RenderViewContextMenu::AppendPluginItems() {
   if (params_.link_url.is_empty() && params_.selection_text.empty())

[raymes, 2015/02/18 00:39:46]

As mentioned on my comment in the previous CL - I would like to revert this part
of the change as well and follow the full-page case when it is a MimeHandlerView

     AppendPageItems();
 }
 
 void RenderViewContextMenu::AppendPageItems() {
   menu_model_.AddItemWithStringId(IDC_BACK, IDS_CONTENT_CONTEXT_BACK);
   menu_model_.AddItemWithStringId(IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD);
   menu_model_.AddItemWithStringId(IDC_RELOAD, IDS_CONTENT_CONTEXT_RELOAD);
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_SAVE_PAGE,
                                   IDS_CONTENT_CONTEXT_SAVEPAGEAS);
@@ skipping 216 matching lines @@
 
   if (id >= IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST &&
       id <= IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_LAST) {
     return true;
   }
 
   IncognitoModePrefs::Availability incognito_avail =
       IncognitoModePrefs::GetAvailability(prefs);
   switch (id) {
     case IDC_BACK:
-      return source_web_contents_->GetController().CanGoBack();
+      return GetWebContentsToUse(source_web_contents_)

[Avi (use Gerrit), 2015/02/17 16:22:42]

Can you pull GetWebContentsToUse(source_web_contents_) into a variable?

+          ->GetController().CanGoBack();
 
     case IDC_FORWARD:
-      return source_web_contents_->GetController().CanGoForward();
+      return GetWebContentsToUse(source_web_contents_)
+          ->GetController().CanGoForward();
 
     case IDC_RELOAD: {
-      CoreTabHelper* core_tab_helper =
-          CoreTabHelper::FromWebContents(source_web_contents_);
+      CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(
+          GetWebContentsToUse(source_web_contents_));
       if (!core_tab_helper)
         return false;
 
       CoreTabHelperDelegate* core_delegate = core_tab_helper->delegate();
       return !core_delegate ||
-             core_delegate->CanReloadContents(source_web_contents_);
+             core_delegate->CanReloadContents(
+                 GetWebContentsToUse(source_web_contents_));
     }
 
     case IDC_VIEW_SOURCE:
     case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE:
-      return source_web_contents_->GetController().CanViewSource();
+      return GetWebContentsToUse(source_web_contents_)
+          ->GetController().CanViewSource();
 
     case IDC_CONTENT_CONTEXT_INSPECTELEMENT:
     case IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE:
     case IDC_CONTENT_CONTEXT_RELOAD_PACKAGED_APP:
     case IDC_CONTENT_CONTEXT_RESTART_PACKAGED_APP:
       return IsDevCommandEnabled(id);
 
     case IDC_CONTENT_CONTEXT_VIEWPAGEINFO:
-      if (source_web_contents_->GetController().GetVisibleEntry() == NULL)
+      if (GetWebContentsToUse(source_web_contents_)
+          ->GetController().GetVisibleEntry() == NULL) {
         return false;
+      }
       // Disabled if no browser is associated (e.g. desktop notifications).
-      if (chrome::FindBrowserWithWebContents(source_web_contents_) == NULL)
+      if (chrome::FindBrowserWithWebContents(
+          GetWebContentsToUse(source_web_contents_)) == NULL) {
         return false;
+      }
       return true;
 
     case IDC_CONTENT_CONTEXT_TRANSLATE: {
       ChromeTranslateClient* chrome_translate_client =
           ChromeTranslateClient::FromWebContents(source_web_contents_);
       if (!chrome_translate_client)
         return false;
       std::string original_lang =
           chrome_translate_client->GetLanguageState().original_language();
       std::string target_lang = g_browser_process->GetApplicationLocale();
@@ skipping 99 matching lines @@
       return can_save;
     }
 
     case IDC_CONTENT_CONTEXT_OPENAVNEWTAB:
       // Currently, a media element can be opened in a new tab iff it can
       // be saved. So rather than duplicating the MediaCanSave flag, we rely
       // on that here.
       return !!(params_.media_flags & WebContextMenuData::MediaCanSave);
 
     case IDC_SAVE_PAGE: {
-      CoreTabHelper* core_tab_helper =
-          CoreTabHelper::FromWebContents(source_web_contents_);
+      CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(
+          GetWebContentsToUse(source_web_contents_));
       if (!core_tab_helper)
         return false;
 
       CoreTabHelperDelegate* core_delegate = core_tab_helper->delegate();
-      if (core_delegate &&
-          !core_delegate->CanSaveContents(source_web_contents_))
+      if (core_delegate && !core_delegate->CanSaveContents(
+          GetWebContentsToUse(source_web_contents_))) {
         return false;
+      }
 
       PrefService* local_state = g_browser_process->local_state();
       DCHECK(local_state);
       // Test if file-selection dialogs are forbidden by policy.
       if (!local_state->GetBoolean(prefs::kAllowFileSelectionDialogs))
         return false;
 
       // We save the last committed entry (which the user is looking at), as
       // opposed to any pending URL that hasn't committed yet.
-      NavigationEntry* entry =
-          source_web_contents_->GetController().GetLastCommittedEntry();
+      NavigationEntry* entry = GetWebContentsToUse(source_web_contents_)
+                                   ->GetController().GetLastCommittedEntry();
       return content::IsSavableURL(entry ? entry->GetURL() : GURL());
     }
 
     case IDC_CONTENT_CONTEXT_RELOADFRAME:
       return params_.frame_url.is_valid();
 
     case IDC_CONTENT_CONTEXT_UNDO:
       return !!(params_.edit_flags & WebContextMenuData::CanUndo);
 
     case IDC_CONTENT_CONTEXT_REDO:
@@ skipping 265 matching lines @@
 
     case IDC_CONTENT_CONTEXT_ROTATECCW:
       content::RecordAction(
       UserMetricsAction("PluginContextMenu_RotateCounterclockwise"));
       PluginActionAt(
           gfx::Point(params_.x, params_.y),
           WebPluginAction(WebPluginAction::Rotate90Counterclockwise, true));
       break;
 
     case IDC_BACK:
-      source_web_contents_->GetController().GoBack();
+      GetWebContentsToUse(source_web_contents_)->GetController().GoBack();
       break;
 
     case IDC_FORWARD:
-      source_web_contents_->GetController().GoForward();
+      GetWebContentsToUse(source_web_contents_)->GetController().GoForward();
       break;
 
     case IDC_SAVE_PAGE:
-      source_web_contents_->OnSavePage();
+      GetWebContentsToUse(source_web_contents_)->OnSavePage();
       break;
 
     case IDC_RELOAD:
-      source_web_contents_->GetController().Reload(true);
+      GetWebContentsToUse(source_web_contents_)->GetController().Reload(true);
       break;
 
     case IDC_CONTENT_CONTEXT_RELOAD_PACKAGED_APP: {
       const Extension* platform_app = GetExtension();
       DCHECK(platform_app);
       DCHECK(platform_app->is_platform_app());
 
       extensions::ExtensionSystem::Get(browser_context_)
           ->extension_service()
           ->ReloadExtension(platform_app->id());
@@ skipping 22 matching lines @@
 
       printing::StartPrint(
           source_web_contents_,
           GetPrefs(browser_context_)->GetBoolean(prefs::kPrintPreviewDisabled),
           !params_.selection_text.empty());
 #endif  // ENABLE_PRINTING
       break;
     }
 
     case IDC_VIEW_SOURCE:
-      source_web_contents_->ViewSource();
+      GetWebContentsToUse(source_web_contents_)->ViewSource();
       break;
 
     case IDC_CONTENT_CONTEXT_INSPECTELEMENT:
       Inspect(params_.x, params_.y);
       break;
 
     case IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE: {
       const Extension* platform_app = GetExtension();
       DCHECK(platform_app);
       DCHECK(platform_app->is_platform_app());
 
       extensions::devtools_util::InspectBackgroundPage(platform_app,
                                                        GetProfile());
       break;
     }
 
     case IDC_CONTENT_CONTEXT_VIEWPAGEINFO: {
-      NavigationController* controller = &source_web_contents_->GetController();
+      NavigationController* controller =
+          &GetWebContentsToUse(source_web_contents_)->GetController();
       // Important to use GetVisibleEntry to match what's showing in the
       // omnibox.  This may return null.
       NavigationEntry* nav_entry = controller->GetVisibleEntry();
       if (!nav_entry)
         return;
-      Browser* browser =
-          chrome::FindBrowserWithWebContents(source_web_contents_);
-      chrome::ShowWebsiteSettings(browser, source_web_contents_,
+      Browser* browser = chrome::FindBrowserWithWebContents(
+          GetWebContentsToUse(source_web_contents_));
+      chrome::ShowWebsiteSettings(browser,
+                                  GetWebContentsToUse(source_web_contents_),
                                   nav_entry->GetURL(), nav_entry->GetSSL());
       break;
     }
 
     case IDC_CONTENT_CONTEXT_TRANSLATE: {
       // A translation might have been triggered by the time the menu got
       // selected, do nothing in that case.
       ChromeTranslateClient* chrome_translate_client =
           ChromeTranslateClient::FromWebContents(source_web_contents_);
       if (!chrome_translate_client ||
@@ skipping 218 matching lines @@
 void RenderViewContextMenu::MediaPlayerActionAt(
     const gfx::Point& location,
     const WebMediaPlayerAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
-  RenderFrameHost* render_frame_host = GetRenderFrameHost();
-  if (!render_frame_host)
-    return;
-  WebContents::FromRenderFrameHost(render_frame_host)->GetRenderViewHost()
-      ->ExecutePluginActionAtLocation(location, action);
+  source_web_contents_->GetRenderViewHost()->ExecutePluginActionAtLocation(
+      location, action);
 }