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

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 1821823004: [Mac][Material Design] Update Omnibox dropdown on Mac to MD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up for review. Created 4 years, 8 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/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() {

Powered by Google App Engine
This is Rietveld 408576698