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

Unified Diff: chrome/browser/ui/views/frame/browser_view.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/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 93ea11764247da03a47f8b1f50f96ffaeedf8ed3..6ecd5d0ff4a2fd3925763089cc28c0f2c6562441 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -171,7 +171,6 @@
using base::TimeDelta;
using base::UserMetricsAction;
using content::NativeWebKeyboardEvent;
-using content::SSLStatus;
using content::WebContents;
using views::ColumnSet;
using views::GridLayout;
@@ -1386,10 +1385,11 @@ void BrowserView::UserChangedTheme() {
frame_->FrameTypeChanged();
}
-void BrowserView::ShowWebsiteSettings(Profile* profile,
- content::WebContents* web_contents,
- const GURL& url,
- const content::SSLStatus& ssl) {
+void BrowserView::ShowWebsiteSettings(
+ Profile* profile,
+ content::WebContents* web_contents,
+ const GURL& url,
+ const SecurityStateModel::SecurityInfo& security_info) {
// Some browser windows have a location icon embedded in the frame. Try to
// use that if it exists. If it doesn't exist, use the location icon from
// the location bar.
@@ -1398,7 +1398,7 @@ void BrowserView::ShowWebsiteSettings(Profile* profile,
popup_anchor = GetLocationBarView()->location_icon_view();
WebsiteSettingsPopupView::ShowPopup(popup_anchor, gfx::Rect(), profile,
- web_contents, url, ssl);
+ web_contents, url, security_info);
}
void BrowserView::ShowAppMenu() {

Powered by Google App Engine
This is Rietveld 408576698