| 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 18c595cf53935e625b12390441fd2215fe4a9dca..eb64a73eece6b39a711c4a88e673e4a768ca7c1a 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
|
| @@ -615,16 +615,15 @@ void LocationBarViewMac::OnThemeChanged() {
|
| }
|
|
|
| void LocationBarViewMac::OnChanged() {
|
| - NSImage* image = nil;
|
| - if (ui::MaterialDesignController::IsModeMaterial()) {
|
| - UpdateLocationIcon();
|
| - } else {
|
| + if (!ui::MaterialDesignController::IsModeMaterial()) {
|
| const int resource_id = omnibox_view_->GetIcon();
|
| - image = OmniboxViewMac::ImageForResource(resource_id);
|
| + NSImage* image = OmniboxViewMac::ImageForResource(resource_id);
|
| location_icon_decoration_->SetImage(image);
|
| ev_bubble_decoration_->SetImage(image);
|
| Layout();
|
| + return;
|
| }
|
| + UpdateLocationIcon();
|
| }
|
|
|
| void LocationBarViewMac::OnSetFocus() {
|
|
|