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

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

Issue 1123943002: Move SecurityLevel into a class of its own (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more android build fixes Created 5 years, 7 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
Index: chrome/browser/ui/toolbar/test_toolbar_model.h
diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.h b/chrome/browser/ui/toolbar/test_toolbar_model.h
index 614ddc531d19f5c73ee6dfe8985b87a184011ce0..654323599e93eebe0d522ac8e6375c778b846185 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.h
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.h
@@ -7,6 +7,7 @@
#include "base/compiler_specific.h"
#include "base/strings/string16.h"
+#include "chrome/browser/ssl/security_level_policy.h"
#include "chrome/browser/ui/toolbar/toolbar_model.h"
// A ToolbarModel that is backed by instance variables, which are initialized
@@ -21,9 +22,11 @@ class TestToolbarModel : public ToolbarModel {
base::string16 GetCorpusNameForMobile() const override;
GURL GetURL() const override;
bool WouldPerformSearchTermReplacement(bool ignore_editing) const override;
- SecurityLevel GetSecurityLevel(bool ignore_editing) const override;
+ SecurityLevelPolicy::SecurityLevel GetSecurityLevel(
+ bool ignore_editing) const override;
int GetIcon() const override;
- int GetIconForSecurityLevel(SecurityLevel level) const override;
+ int GetIconForSecurityLevel(
+ SecurityLevelPolicy::SecurityLevel level) const override;
base::string16 GetEVCertName() const override;
bool ShouldDisplayURL() const override;
@@ -33,7 +36,7 @@ class TestToolbarModel : public ToolbarModel {
bool perform_search_term_replacement) {
perform_search_term_replacement_ = perform_search_term_replacement;
}
- void set_security_level(SecurityLevel security_level) {
+ void set_security_level(SecurityLevelPolicy::SecurityLevel security_level) {
security_level_ = security_level;
}
void set_icon(int icon) { icon_ = icon; }
@@ -48,7 +51,7 @@ class TestToolbarModel : public ToolbarModel {
base::string16 text_;
GURL url_;
bool perform_search_term_replacement_;
- SecurityLevel security_level_;
+ SecurityLevelPolicy::SecurityLevel security_level_;
int icon_;
base::string16 ev_cert_name_;
bool should_display_url_;

Powered by Google App Engine
This is Rietveld 408576698