chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm - Issue 897923002: Revert of [OSX] Allow one zoom bubble to override another.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 897923002: Revert of [OSX] Allow one zoom bubble to override another. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm

index 3db743d6ed644f8f1c84fef566b8019eba708400..7306dd10c75c8b4cea9d06142bcf406b21529732 100644

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

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

@@ -23,7 +23,6 @@

ZoomDecoration::~ZoomDecoration() {

[bubble_ closeWithoutAnimation];

- bubble_.delegate = nil;

}

bool ZoomDecoration::UpdateIfNecessary(

@@ -49,11 +48,8 @@

}

void ZoomDecoration::ShowBubble(BOOL auto_close) {

- if (bubble_) {

- bubble_.delegate = nil;

- [bubble_.window orderOut:nil];

- [bubble_ closeWithoutAnimation];

- }

+ if (bubble_)

+ return;

content::WebContents* web_contents = owner_->GetWebContents();

if (!web_contents)

@@ -142,7 +138,6 @@

}

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 »