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

Unified Diff: chrome/browser/ui/browser.cc

Issue 1473523002: Switch SecurityStateModel ownership to ChromeSecurityStateModelClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 14de5c7c953315aa988b50d49b6cfb55a777cbcc..c91506c60fe181a54e179d6e4ca08c873de48b57 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -76,6 +76,7 @@
#include "chrome/browser/sessions/session_service_factory.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/sessions/tab_restore_service_factory.h"
+#include "chrome/browser/ssl/chrome_security_state_model_client.h"
#include "chrome/browser/ssl/security_state_model.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/sync_ui_util.h"
@@ -1313,10 +1314,11 @@ bool Browser::CanDragEnter(content::WebContents* source,
content::SecurityStyle Browser::GetSecurityStyle(
WebContents* web_contents,
content::SecurityStyleExplanations* security_style_explanations) {
- SecurityStateModel* model = SecurityStateModel::FromWebContents(web_contents);
- DCHECK(model);
+ ChromeSecurityStateModelClient* model_delegate =
+ ChromeSecurityStateModelClient::FromWebContents(web_contents);
+ DCHECK(model_delegate);
const SecurityStateModel::SecurityInfo& security_info =
- model->GetSecurityInfo();
+ model_delegate->GetSecurityInfo();
const content::SecurityStyle security_style =
SecurityLevelToSecurityStyle(security_info.security_level);

Powered by Google App Engine
This is Rietveld 408576698