Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: chrome/browser/renderer_context_menu/render_view_context_menu.cc

Issue 1314953009: Refactor WebsiteSettings to operate on a SecurityInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index fc5ae9c571c60da9c4bac490f75a0c234bddfb36..5a4ab40131b9e7646e31a3ba46e0a045871eb86b 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -44,6 +44,7 @@
#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"
@@ -1693,8 +1694,12 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
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;
}
@@ -1742,8 +1747,14 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
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
estark 2015/09/18 16:06:09 All the other call sites are displaying WebsiteSet
+ 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;
}

Powered by Google App Engine
This is Rietveld 408576698