Commit 5514bb10 authored by Livvie Lin's avatar Livvie Lin Committed by Commit Bot

Rename https_invalid.icon to be more general

Renames https_invalid.icon since the triangle icon will be used
for HTTP pages as well as part of crbug.com/997972.

Bug: 1008218
Change-Id: I031ab884361c5085f7ef0f7b93935e235540005a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846567Reviewed-by: default avatarTibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Commit-Queue: Livvie Lin <livvielin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705185}
parent 7f1fb68f
...@@ -223,7 +223,7 @@ gfx::ImageSkia AutofillPopupLayoutModel::GetIconImage(size_t index) const { ...@@ -223,7 +223,7 @@ gfx::ImageSkia AutofillPopupLayoutModel::GetIconImage(size_t index) const {
gfx::kChromeIconGrey); gfx::kChromeIconGrey);
} }
if (icon_str == "httpsInvalid") { if (icon_str == "httpsInvalid") {
return gfx::CreateVectorIcon(omnibox::kHttpsInvalidIcon, kIconSize, return gfx::CreateVectorIcon(omnibox::kNotSecureWarningIcon, kIconSize,
gfx::kGoogleRed700); gfx::kGoogleRed700);
} }
if (icon_str == "keyIcon") { if (icon_str == "keyIcon") {
......
...@@ -720,8 +720,8 @@ void VrTestContext::CycleOrigin() { ...@@ -720,8 +720,8 @@ void VrTestContext::CycleOrigin() {
security_state::SecurityLevel::SECURE, &omnibox::kHttpsValidIcon, true, security_state::SecurityLevel::SECURE, &omnibox::kHttpsValidIcon, true,
false}, false},
{GURL("https://www.domain.com/path/segment/directory/file.html"), {GURL("https://www.domain.com/path/segment/directory/file.html"),
security_state::SecurityLevel::DANGEROUS, &omnibox::kHttpsInvalidIcon, security_state::SecurityLevel::DANGEROUS,
true, false}, &omnibox::kNotSecureWarningIcon, true, false},
// Do not show URL // Do not show URL
{GURL(), security_state::SecurityLevel::WARNING, &omnibox::kHttpIcon, {GURL(), security_state::SecurityLevel::WARNING, &omnibox::kHttpIcon,
false, false}, false, false},
......
...@@ -46,10 +46,10 @@ aggregate_vector_icons("omnibox_vector_icons") { ...@@ -46,10 +46,10 @@ aggregate_vector_icons("omnibox_vector_icons") {
"extension_app.icon", "extension_app.icon",
"find_in_page.icon", "find_in_page.icon",
"http.icon", "http.icon",
"https_invalid.icon",
"https_valid.icon", "https_valid.icon",
"https_valid_in_chip.icon", "https_valid_in_chip.icon",
"keyword_search.icon", "keyword_search.icon",
"not_secure_warning.icon",
"offline_pin.icon", "offline_pin.icon",
"page.icon", "page.icon",
"pedal.icon", "pedal.icon",
......
...@@ -195,7 +195,7 @@ const gfx::VectorIcon& LocationBarModelImpl::GetVectorIcon() const { ...@@ -195,7 +195,7 @@ const gfx::VectorIcon& LocationBarModelImpl::GetVectorIcon() const {
case security_state::SECURE_WITH_POLICY_INSTALLED_CERT: case security_state::SECURE_WITH_POLICY_INSTALLED_CERT:
return vector_icons::kBusinessIcon; return vector_icons::kBusinessIcon;
case security_state::DANGEROUS: case security_state::DANGEROUS:
return omnibox::kHttpsInvalidIcon; return omnibox::kNotSecureWarningIcon;
case security_state::SECURITY_LEVEL_COUNT: case security_state::SECURITY_LEVEL_COUNT:
NOTREACHED(); NOTREACHED();
return omnibox::kHttpIcon; return omnibox::kHttpIcon;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment