chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h - 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/website_settings/website_settings_bubble_controller.h

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/location_bar/location_icon_decoration.mm ('k') | chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.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/website_settings/website_settings_bubble_controller.h

diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h

index c8b37e52ab38f33537699f2848a9a0939ae0295d..4904493cd3beed4e8fb1962ecdb800493822495b 100644

--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h

+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h

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

#include "base/mac/scoped_nsobject.h"

#include "base/memory/scoped_ptr.h"

+#include "chrome/browser/ssl/security_state_model.h"

#import "chrome/browser/ui/cocoa/base_bubble_controller.h"

#include "chrome/browser/ui/website_settings/website_settings_ui.h"

#include "content/public/browser/web_contents_observer.h"

@@ -106,13 +107,14 @@ class WebsiteSettingsUIBridge : public content::WebContentsObserver,

// Creates a |WebsiteSettingsBubbleController| and displays the UI. |parent|

// is the currently active window. |profile| points to the currently active

// profile. |web_contents| points to the WebContents that wraps the currently

- // active tab. |url| is the GURL of the currently active tab. |ssl| is the

- // |SSLStatus| of the connection to the website in the currently active tab.

+ // active tab. |url| is the GURL of the currently active

+ // tab. |security_info| is the |SecurityStateModel::SecurityInfo| of

+ // the connection to the website in the currently active tab.

static void Show(gfx::NativeWindow parent,

Profile* profile,

content::WebContents* web_contents,

const GURL& url,

- const content::SSLStatus& ssl);

+ const SecurityStateModel::SecurityInfo& security_info);

void set_bubble_controller(

WebsiteSettingsBubbleController* bubble_controller);