Chromium Code Reviews| Index: chrome/browser/ssl/chrome_security_state_model_client.h |
| diff --git a/chrome/browser/ssl/chrome_security_state_model_client.h b/chrome/browser/ssl/chrome_security_state_model_client.h |
| index 6e87cfb35de122fd2062b4054d33530726f071c3..6c76403a88eef24437feb23fa75c6c7dba60787c 100644 |
| --- a/chrome/browser/ssl/chrome_security_state_model_client.h |
| +++ b/chrome/browser/ssl/chrome_security_state_model_client.h |
| @@ -6,8 +6,8 @@ |
| #define CHROME_BROWSER_SSL_CHROME_SECURITY_STATE_MODEL_CLIENT_H_ |
| #include "base/macros.h" |
| -#include "chrome/browser/ssl/security_state_model.h" |
| -#include "chrome/browser/ssl/security_state_model_client.h" |
| +#include "components/security_state/security_state_model.h" |
| +#include "components/security_state/security_state_model_client.h" |
| #include "content/public/browser/web_contents_user_data.h" |
| namespace content { |
| @@ -17,16 +17,17 @@ class WebContents; |
| // Uses a WebContents to provide a SecurityStateModel with the |
| // information that it needs to determine the page's security status. |
| class ChromeSecurityStateModelClient |
| - : public SecurityStateModelClient, |
| + : public security_state::SecurityStateModelClient, |
| public content::WebContentsUserData<ChromeSecurityStateModelClient> { |
| public: |
| ~ChromeSecurityStateModelClient() override; |
| - const SecurityStateModel::SecurityInfo& GetSecurityInfo() const; |
| + const security_state::SecurityStateModel::SecurityInfo& GetSecurityInfo() |
|
felt
2015/12/22 17:29:08
nit: this is repeated often enough that it might m
tfarina
2015/12/22 17:30:30
certainly, you won't be doing this in a header fil
felt
2015/12/22 17:34:30
sorry, i meant to make this comment on the next (.
estark
2015/12/22 18:31:12
Done in .cc files where it's used more than a hand
|
| + const; |
| // SecurityStateModelClient: |
| void GetVisibleSecurityState( |
| - SecurityStateModel::VisibleSecurityState* state) override; |
| + security_state::SecurityStateModel::VisibleSecurityState* state) override; |
| bool RetrieveCert(scoped_refptr<net::X509Certificate>* cert) override; |
| bool UsedPolicyInstalledCertificate() override; |
| bool IsOriginSecure(const GURL& url) override; |
| @@ -36,7 +37,7 @@ class ChromeSecurityStateModelClient |
| friend class content::WebContentsUserData<ChromeSecurityStateModelClient>; |
| content::WebContents* web_contents_; |
| - scoped_ptr<SecurityStateModel> security_state_model_; |
| + scoped_ptr<security_state::SecurityStateModel> security_state_model_; |
| DISALLOW_COPY_AND_ASSIGN(ChromeSecurityStateModelClient); |
| }; |