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

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

Issue 1680773006: Implement Material Design for Mac toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_master
Patch Set: Change button hover and pressed styles. Created 4 years, 9 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 c3d9761ebda73bb1ef82ce2db7529fac70529098..2f33f711b3194ba7a41596bec184b9fc8b266354 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
@@ -331,7 +331,8 @@ void LocationBarViewMac::SetStarred(bool starred) {
if (star_decoration_->starred() == starred)
return;
- star_decoration_->SetStarred(starred);
+ star_decoration_->SetStarred(starred,
+ [[field_ window] inIncognitoModeWithSystemTheme]);
UpdateBookmarkStarVisibility();
OnDecorationsChanged();
}
@@ -551,6 +552,11 @@ void LocationBarViewMac::OnChanged() {
location_icon_decoration_->SetImage(image);
ev_bubble_decoration_->SetImage(image);
Layout();
+
+ // Make sure we're displaying the correct icon color for a dark location bar.
+ if ([[field_ window] inIncognitoModeWithSystemTheme]) {
+ star_decoration_->SetStarred(star_decoration_->starred(), true);
+ }
}
void LocationBarViewMac::OnSetFocus() {

Powered by Google App Engine
This is Rietveld 408576698