[OSX] Allow one zoom bubble to override another.

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

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner)
     : owner_(owner),
       bubble_(nil) {
 }
 
 ZoomDecoration::~ZoomDecoration() {
   [bubble_ closeWithoutAnimation];
+  bubble_.delegate = nil;
 }
 
 bool ZoomDecoration::UpdateIfNecessary(
     ui_zoom::ZoomController* zoom_controller) {
   if (!ShouldShowDecoration()) {
     if (!IsVisible() && !bubble_)
       return false;
 
     HideUI();
     return true;
   }
 
   base::string16 zoom_percent =
       base::IntToString16(zoom_controller->GetZoomPercent());
   NSString* zoom_string =
       l10n_util::GetNSStringFWithFixup(IDS_TOOLTIP_ZOOM, zoom_percent);
 
   if (IsVisible() && [tooltip_ isEqualToString:zoom_string])
     return false;
 
   ShowAndUpdateUI(zoom_controller, zoom_string);
   return true;
 }
 
 void ZoomDecoration::ShowBubble(BOOL auto_close) {
-  if (bubble_)
-    return;
+  if (bubble_) {
+    bubble_.delegate = nil;
+    [bubble_.window orderOut:nil];
+    [bubble_ closeWithoutAnimation];
+  }
 
   content::WebContents* web_contents = owner_->GetWebContents();
   if (!web_contents)
     return;
 
   // Get the frame of the decoration.
   AutocompleteTextField* field = owner_->GetAutocompleteTextField();
   const NSRect frame =
       [[field cell] frameForDecoration:this inFrame:[field bounds]];
 
@@ skipping 68 matching lines @@
 
 NSString* ZoomDecoration::GetToolTip() {
   return tooltip_.get();
 }
 
 content::WebContents* ZoomDecoration::GetWebContents() {
   return owner_->GetWebContents();
 }
 
 void ZoomDecoration::OnClose() {
+  bubble_.delegate = nil;
   bubble_ = nil;
 
   // If the page is at default zoom then hiding the zoom decoration
   // was suppressed while the bubble was open. Now that the bubble is
   // closed the decoration can be hidden.
   if (IsAtDefaultZoom() && IsVisible()) {
     SetVisible(false);
     owner_->OnDecorationsChanged();
   }
 }