Chromium Code Reviews| Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm |
| diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm |
| index 22d28186f262b1e28fc14d42ed9b9de3cf6fb527..8ea6b87d119e86fb0a8d5acbf8de383fa14c3f85 100644 |
| --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm |
| +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm |
| @@ -559,10 +559,11 @@ void LocationBarViewMac::UpdateLocationIcon() { |
| SkColor vectorIconColor = gfx::kPlaceholderColor; |
| gfx::VectorIconId vectorIconId = gfx::VectorIconId::VECTOR_ICON_NONE; |
| - const int kIconSize = 16; |
| + int iconSize = 16; |
|
tapted
2016/04/22 00:41:52
these should all be hacker_style
const int kDefau
shrike
2016/04/22 05:46:30
By "hacker_style" you mean with underbars? This is
tapted
2016/04/22 06:09:48
yup - underbars. And the naming scheme for Objecti
shrike
2016/04/22 06:24:15
Ah, OK, I see where I was confused. Thanks.
|
| if (ShouldShowEVBubble()) { |
|
tapted
2016/04/22 00:41:52
Hm. could this even move into ev_bubble_decoration
shrike
2016/04/22 05:46:30
In general the icon does not change but that's not
tapted
2016/04/22 06:09:48
wouldn't that need handling for `vectorIconColor`
shrike
2016/04/22 06:24:15
The vector icon code is a little screwy (if you as
tapted
2016/04/25 21:48:10
Acknowledged.
|
| vectorIconId = gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_IN_CHIP; |
| vectorIconColor = gfx::kGoogleGreen700; |
| + iconSize = 12; |
| } else { |
| vectorIconId = omnibox_view_->GetVectorIcon(inDarkMode); |
| if (inDarkMode) { |
| @@ -577,7 +578,7 @@ void LocationBarViewMac::UpdateLocationIcon() { |
| DCHECK(vectorIconId != gfx::VectorIconId::VECTOR_ICON_NONE); |
| NSImage* image = NSImageFromImageSkia(gfx::CreateVectorIcon( |
| - vectorIconId, kIconSize, vectorIconColor)); |
| + vectorIconId, iconSize, vectorIconColor)); |
| location_icon_decoration_->SetImage(image); |
| ev_bubble_decoration_->SetImage(image); |