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

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

Issue 1314843007: Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: create SecurityStateModel for chromeos login webview 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/toolbar/test_toolbar_model.h ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/test_toolbar_model.cc
diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.cc b/chrome/browser/ui/toolbar/test_toolbar_model.cc
index db50507ca86ae9b4b2df88722a35a0851159006c..ccec8f85d47e181db496ffd1e0dd3a1a7433e2e4 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc
@@ -9,7 +9,7 @@
TestToolbarModel::TestToolbarModel()
: ChromeToolbarModel(),
perform_search_term_replacement_(false),
- security_level_(connection_security::NONE),
+ security_level_(SecurityStateModel::NONE),
icon_(IDR_LOCATION_BAR_HTTP),
should_display_url_(true) {}
@@ -36,7 +36,7 @@ bool TestToolbarModel::WouldPerformSearchTermReplacement(
return perform_search_term_replacement_;
}
-connection_security::SecurityLevel TestToolbarModel::GetSecurityLevel(
+SecurityStateModel::SecurityLevel TestToolbarModel::GetSecurityLevel(
bool ignore_editing) const {
return security_level_;
}
@@ -46,8 +46,8 @@ int TestToolbarModel::GetIcon() const {
}
base::string16 TestToolbarModel::GetEVCertName() const {
- return (security_level_ == connection_security::EV_SECURE) ? ev_cert_name_
- : base::string16();
+ return (security_level_ == SecurityStateModel::EV_SECURE) ? ev_cert_name_
+ : base::string16();
}
bool TestToolbarModel::ShouldDisplayURL() const {
« no previous file with comments | « chrome/browser/ui/toolbar/test_toolbar_model.h ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698