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

Side by Side Diff: chrome/browser/ssl/chrome_security_state_model_client.h

Issue 2448943002: Refactor SecurityStateModel/Clients for simplicity and reusability. (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_CLIENT_H_ 5 #ifndef CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_CLIENT_H_
6 #define CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_CLIENT_H_ 6 #define CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_CLIENT_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "components/security_state/security_state_model.h" 11 #include "components/security_state/content/web_contents_security_state_model_cl ient.h"
12 #include "components/security_state/security_state_model_client.h" 12 #include "components/security_state/core/security_state_model.h"
13 #include "content/public/browser/web_contents_observer.h" 13 #include "content/public/browser/web_contents_observer.h"
14 #include "content/public/browser/web_contents_user_data.h" 14 #include "content/public/browser/web_contents_user_data.h"
15 #include "third_party/WebKit/public/platform/WebSecurityStyle.h" 15 #include "third_party/WebKit/public/platform/WebSecurityStyle.h"
16 16
17 namespace content { 17 namespace content {
18 struct SecurityStyleExplanations; 18 struct SecurityStyleExplanations;
19 class NavigationEntry;
19 class NavigationHandle; 20 class NavigationHandle;
20 class WebContents; 21 class WebContents;
21 } // namespace content 22 } // namespace content
22 23
23 // Uses a WebContents to provide a SecurityStateModel with the 24 // Uses a WebContents to provide a SecurityStateModel with the
24 // information that it needs to determine the page's security status. 25 // information that it needs to determine the page's security status.
25 class ChromeSecurityStateModelClient 26 class ChromeSecurityStateModelClient
26 : public security_state::SecurityStateModelClient, 27 : public security_state::WebContentsSecurityStateModelClient,
27 public content::WebContentsObserver, 28 public content::WebContentsObserver,
28 public content::WebContentsUserData<ChromeSecurityStateModelClient> { 29 public content::WebContentsUserData<ChromeSecurityStateModelClient> {
29 public: 30 public:
30 ~ChromeSecurityStateModelClient() override; 31 ~ChromeSecurityStateModelClient() override;
31 32
32 void GetSecurityInfo(
33 security_state::SecurityStateModel::SecurityInfo* result) const;
34
35 // Called when the NavigationEntry's SSLStatus changes. 33 // Called when the NavigationEntry's SSLStatus changes.
36 void VisibleSSLStateChanged(); 34 void VisibleSSLStateChanged();
37 35
38 // content::WebContentsObserver: 36 // content::WebContentsObserver:
39 void DidFinishNavigation( 37 void DidFinishNavigation(
40 content::NavigationHandle* navigation_handle) override; 38 content::NavigationHandle* navigation_handle) override;
41 39
42 // Returns the SecurityStyle that should be applied to a WebContents
43 // with the given |security_info|. Populates
44 // |security_style_explanations| to explain why the returned
45 // SecurityStyle was chosen.
46 static blink::WebSecurityStyle GetSecurityStyle(
47 const security_state::SecurityStateModel::SecurityInfo& security_info,
48 content::SecurityStyleExplanations* security_style_explanations);
49
50 // SecurityStateModelClient: 40 // SecurityStateModelClient:
51 void GetVisibleSecurityState(
52 security_state::SecurityStateModel::VisibleSecurityState* state) override;
53 bool UsedPolicyInstalledCertificate() override; 41 bool UsedPolicyInstalledCertificate() override;
54 bool IsOriginSecure(const GURL& url) override;
55 42
56 private: 43 private:
57 explicit ChromeSecurityStateModelClient(content::WebContents* web_contents); 44 explicit ChromeSecurityStateModelClient(content::WebContents* web_contents);
58 friend class content::WebContentsUserData<ChromeSecurityStateModelClient>; 45 friend class content::WebContentsUserData<ChromeSecurityStateModelClient>;
59 46
60 content::WebContents* web_contents_; 47 // WebContentsSecurityStateModelClient:
61 std::unique_ptr<security_state::SecurityStateModel> security_state_model_; 48 void CheckMalwareStatus(
49 content::NavigationEntry* entry,
50 content::WebContents* web_contents,
51 security_state::SecurityStateModel::VisibleSecurityState* state) override;
62 52
63 // True if a console has been logged about an omnibox warning that 53 // True if a console has been logged about an omnibox warning that
64 // will be shown in future versions of Chrome for insecure HTTP 54 // will be shown in future versions of Chrome for insecure HTTP
65 // pages. This message should only be logged once per main-frame 55 // pages. This message should only be logged once per main-frame
66 // navigation. 56 // navigation.
67 bool logged_http_warning_on_current_navigation_; 57 bool logged_http_warning_on_current_navigation_;
68 58
69 DISALLOW_COPY_AND_ASSIGN(ChromeSecurityStateModelClient); 59 DISALLOW_COPY_AND_ASSIGN(ChromeSecurityStateModelClient);
70 }; 60 };
71 61
72 #endif // CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_CLIENT_H_ 62 #endif // CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698