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

Unified Diff: chrome/browser/ui/cocoa/location_bar/zoom_decoration.h

Issue 1718563002: Convert location bar decorations to Material Design (Mac). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_toolbar
Patch Set: Fix issue from browser test. 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/zoom_decoration.h
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
index 5b5d5ace41bb4c62f00888320ff3475f1ad90c21..8fd72d1d06c9fea173f6e97dd47f4f4b01daf1a6 100644
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
@@ -30,7 +30,8 @@ class ZoomDecoration : public ImageDecoration,
// Called when this decoration should show or hide itself in its most current
// state. Returns whether any updates were made.
bool UpdateIfNecessary(ui_zoom::ZoomController* zoom_controller,
- bool default_zoom_changed);
+ bool default_zoom_changed,
+ bool location_bar_is_dark);
// Shows the zoom bubble for this decoration. If |auto_close| is YES, then
// the bubble will automatically close after a fixed period of time.
@@ -48,7 +49,8 @@ class ZoomDecoration : public ImageDecoration,
// Show and update UI associated with the zoom decoration.
// Virtual and protected for testing.
virtual void ShowAndUpdateUI(ui_zoom::ZoomController* zoom_controller,
- NSString* tooltip_string);
+ NSString* tooltip_string,
+ bool location_bar_is_dark);
private:
friend ZoomDecorationTest;
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/translate_decoration.mm ('k') | chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698