Refactor WebsiteSettings to operate on a SecurityInfo

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 26 matching lines @@
 #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"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
+#include "chrome/browser/ssl/security_state_model.h"
 #include "chrome/browser/tab_contents/retargeting_details.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 1629 matching lines @@
     case IDC_CONTENT_CONTEXT_VIEWPAGEINFO: {
       NavigationController* controller =
           &embedder_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(embedder_web_contents_);
+      SecurityStateModel* security_model =
+          SecurityStateModel::FromWebContents(embedder_web_contents_);
+      DCHECK(security_model);
       chrome::ShowWebsiteSettings(browser, embedder_web_contents_,
-                                  nav_entry->GetURL(), nav_entry->GetSSL());
+                                  nav_entry->GetURL(),
+                                  security_model->GetSecurityInfo());
       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(embedder_web_contents_);
       if (!chrome_translate_client ||
           chrome_translate_client->GetLanguageState().IsPageTranslated() ||
@@ skipping 27 matching lines @@
       break;
 
     case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE:
       source_web_contents_->ViewFrameSource(params_.frame_url,
                                             params_.frame_page_state);
       break;
 
     case IDC_CONTENT_CONTEXT_VIEWFRAMEINFO: {
       Browser* browser = chrome::FindBrowserWithWebContents(
           source_web_contents_);
+      SecurityStateModel::SecurityInfo security_info;

[sky, 2015/09/18 15:53:00]

How come this code is different than the rest? By that I mean the other sites
like more like 1702 above, you get the SecurityStateModel from a WebContents and
then call GetSecurityInfo()?

[estark, 2015/09/18 16:06:09]

All the other call sites are displaying WebsiteSettings for the current page.
That's what happens when you click on the lock icon and go to the Connection
tab, for example. Or when you right-click on the page and select View Page Info.

This callsite is handling the case when you right click on an iframe and select
View Frame Info. In that case WebsiteSettings opens up and shows you the
information for the main resource of the subframe, rather than the top-level
page.

You can see this difference in the original code too; in this callsite the
original code uses the the security_info from the IPC params (that is, the
security info for the resource on which the menu is showing), whereas the
original line 1697 uses the security info from the navigation entry of the
WebContents.

Happy to add a comment here if that would be helpful.

+      SecurityStateModel::SecurityInfoForRequest(
+          params_.frame_url, params_.security_info,
+          Profile::FromBrowserContext(
+              source_web_contents_->GetBrowserContext()),
+          &security_info);
       chrome::ShowWebsiteSettings(browser, source_web_contents_,
-                                  params_.frame_url, params_.security_info);
+                                  params_.frame_url, security_info);
       break;
     }
 
     case IDC_CONTENT_CONTEXT_UNDO:
       source_web_contents_->Undo();
       break;
 
     case IDC_CONTENT_CONTEXT_REDO:
       source_web_contents_->Redo();
       break;
@@ skipping 191 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);
 }