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

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

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unit test debugging Created 5 years 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/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 c00d3968b4ce76bf45024e572772b4b2b22b6747..381328dd259ac9ed5454c9dc74700da14ade6e6b 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc
@@ -10,7 +10,7 @@
TestToolbarModel::TestToolbarModel()
: ChromeToolbarModel(),
perform_search_term_replacement_(false),
- security_level_(SecurityStateModel::NONE),
+ security_level_(security_state::SecurityStateModel::NONE),
icon_(IDR_LOCATION_BAR_HTTP),
should_display_url_(true) {}
@@ -37,8 +37,8 @@ bool TestToolbarModel::WouldPerformSearchTermReplacement(
return perform_search_term_replacement_;
}
-SecurityStateModel::SecurityLevel TestToolbarModel::GetSecurityLevel(
- bool ignore_editing) const {
+security_state::SecurityStateModel::SecurityLevel
+TestToolbarModel::GetSecurityLevel(bool ignore_editing) const {
return security_level_;
}
@@ -51,8 +51,9 @@ gfx::VectorIconId TestToolbarModel::GetVectorIcon() const {
}
base::string16 TestToolbarModel::GetEVCertName() const {
- return (security_level_ == SecurityStateModel::EV_SECURE) ? ev_cert_name_
- : base::string16();
+ return (security_level_ == security_state::SecurityStateModel::EV_SECURE)
+ ? ev_cert_name_
+ : base::string16();
}
bool TestToolbarModel::ShouldDisplayURL() const {

Powered by Google App Engine
This is Rietveld 408576698