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

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

Issue 12315069: Mac: Update zoom bubble UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 7 years, 10 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 bc70f83d159bb84e02404dca5da495c8918b296f..7819a18ba90533ba25142540de89f87b9948ecdc 100644
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
@@ -13,6 +13,7 @@
class LocationBarViewMac;
@class ZoomBubbleController;
class ZoomController;
+class ZoomDecorationTest;
// Zoom icon at the end of the omnibox (close to page actions) when at a
// non-standard zoom level.
@@ -26,11 +27,16 @@ class ZoomDecoration : public ImageDecoration {
void Update(ZoomController* zoom_controller);
// Shows the zoom bubble for this decoration. If |auto_close| is YES, then
- // the bubble will automatically close after a fixed period of time.
- void ShowBubble(BOOL auto_close);
+ // the bubble will automatically close after a fixed period of time. Closes
+ // the bubble if it was already visible.
+ void ToggleBubble(BOOL auto_close);
private:
+ friend ZoomDecorationTest;
+
NSPoint GetBubblePointInFrame(NSRect frame);
+ bool IsAtDefaultZoom() const;
+ bool ShouldShowDecoration() const;
// LocationBarDecoration implementation.
virtual bool AcceptsMousePress() OVERRIDE;
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/mock_toolbar_model.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