chrome/browser/ui/cocoa/browser_window_cocoa.mm - Issue 1314953009: Refactor WebsiteSettings to operate on a SecurityInfo

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa.mm

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

« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.h ('k') | chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm » ('j') | chrome/browser/ui/website_settings/website_settings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm

index 515594d62ca41f120e0e80426625ac8ceb49b8b2..ba663b53963e34dbd2bc7db416479af23e16fd70 100644

--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm

+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm

@@ -73,7 +73,6 @@

#endif

using content::NativeWebKeyboardEvent;

-using content::SSLStatus;

using content::WebContents;

namespace {

@@ -711,8 +710,9 @@ void BrowserWindowCocoa::ShowWebsiteSettings(

Profile* profile,

content::WebContents* web_contents,

const GURL& url,

- const content::SSLStatus& ssl) {

- WebsiteSettingsUIBridge::Show(window(), profile, web_contents, url, ssl);

+ const SecurityStateModel::SecurityInfo& security_info) {

+ WebsiteSettingsUIBridge::Show(window(), profile, web_contents, url,

+ security_info);

}

void BrowserWindowCocoa::ShowAppMenu() {