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

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

Issue 1566563002: Vectorize CrOS window control icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dummy GetIcon impl in TestToolbarModel Created 4 years, 11 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.cc
diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.cc b/chrome/browser/ui/toolbar/test_toolbar_model.cc
index c00d3968b4ce76bf45024e572772b4b2b22b6747..729a5bfbae9d95669fb00a1f412998c1cd77e419 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc
@@ -11,7 +11,7 @@ TestToolbarModel::TestToolbarModel()
: ChromeToolbarModel(),
perform_search_term_replacement_(false),
security_level_(SecurityStateModel::NONE),
- icon_(IDR_LOCATION_BAR_HTTP),
+ icon_(gfx::VectorIconId::VECTOR_ICON_NONE),
should_display_url_(true) {}
TestToolbarModel::~TestToolbarModel() {}
@@ -43,11 +43,12 @@ SecurityStateModel::SecurityLevel TestToolbarModel::GetSecurityLevel(
}
int TestToolbarModel::GetIcon() const {
- return icon_;
+ // This placeholder implementation should be removed when MD is default.
+ return IDR_LOCATION_BAR_HTTP;
}
gfx::VectorIconId TestToolbarModel::GetVectorIcon() const {
- return gfx::VectorIconId::VECTOR_ICON_NONE;
+ return icon_;
}
base::string16 TestToolbarModel::GetEVCertName() const {
« no previous file with comments | « chrome/browser/ui/toolbar/test_toolbar_model.h ('k') | chrome/browser/ui/views/frame/browser_header_painter_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698