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

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

Issue 849693006: Allow new zoom bubble to override current one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove space. Created 5 years, 11 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
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/zoom_decoration.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm
index 7306dd10c75c8b4cea9d06142bcf406b21529732..ed9b67766e4a70aba640857db600411219cbf16b 100644
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm
@@ -23,6 +23,7 @@ ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner)
ZoomDecoration::~ZoomDecoration() {
[bubble_ closeWithoutAnimation];
+ bubble_.delegate = nil;
}
bool ZoomDecoration::UpdateIfNecessary(
@@ -48,8 +49,8 @@ bool ZoomDecoration::UpdateIfNecessary(
}
void ZoomDecoration::ShowBubble(BOOL auto_close) {
- if (bubble_)
- return;
+ ZoomBubbleController* old_bubble = bubble_;
+ old_bubble.delegate = nil;
content::WebContents* web_contents = owner_->GetWebContents();
if (!web_contents)
@@ -68,6 +69,9 @@ void ZoomDecoration::ShowBubble(BOOL auto_close) {
bubble_ = [[ZoomBubbleController alloc] initWithParentWindow:[field window]
delegate:this];
[bubble_ showAnchoredAt:anchor autoClose:auto_close];
+
+ [old_bubble.window orderOut:nil];
+ [old_bubble closeWithoutAnimation];
}
void ZoomDecoration::CloseBubble() {
@@ -138,6 +142,7 @@ content::WebContents* ZoomDecoration::GetWebContents() {
}
void ZoomDecoration::OnClose() {
+ bubble_.delegate = nil;
bubble_ = nil;
// If the page is at default zoom then hiding the zoom decoration
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/zoom_decoration.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698