chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h - Issue 1539043002: Pull SecurityStateModel out into a component

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 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 11 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/omnibox/omnibox_view_mac.mm ('k') | chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm » ('j') | no next file with comments »
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 2d4f19626f06bf1c21de7b98da67c8541176e1de..3209d35b5040644aaa1fab46c063429976067dfb 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

@@ -7,9 +7,9 @@

#include "base/mac/scoped_nsobject.h"

#include "base/macros.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 "components/security_state/security_state_model.h"

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

class WebsiteSettingsUIBridge;

@@ -112,13 +112,15 @@ class WebsiteSettingsUIBridge : public content::WebContentsObserver,

// 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. |security_info| is the |SecurityStateModel::SecurityInfo| of

+ // tab. |security_info| is the

+ // |security_state::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 SecurityStateModel::SecurityInfo& security_info);

+ static void Show(

+ gfx::NativeWindow parent,

+ Profile* profile,

+ content::WebContents* web_contents,

+ const GURL& url,

+ const security_state::SecurityStateModel::SecurityInfo& security_info);

void set_bubble_controller(

WebsiteSettingsBubbleController* bubble_controller);