Mac: Update zoom bubble UI

chrome/browser/ui/cocoa/location_bar/zoom_decoration.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_
 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h"
 
 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.
 class ZoomDecoration : public ImageDecoration {
  public:
   explicit ZoomDecoration(LocationBarViewMac* owner);
   virtual ~ZoomDecoration();
 
   // Called when this decoration should show or hide itself in its most current
   // state.
   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;
   virtual bool OnMousePressed(NSRect frame) OVERRIDE;
   virtual NSString* GetToolTip() OVERRIDE;
 
   // The control that owns this. Weak.
   LocationBarViewMac* owner_;
 
   // The bubble that this decoration shows. Weak, owns self.
   ZoomBubbleController* bubble_;
 
   // The string to show for a tooltip.
   scoped_nsobject<NSString> tooltip_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomDecoration);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_