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

Unified Diff: chrome/browser/ui/cocoa/history_overlay_controller.mm

Issue 107343008: mac: Fix a history swiper bug where the shield wouldn't disappear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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/history_overlay_controller.mm
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller.mm b/chrome/browser/ui/cocoa/history_overlay_controller.mm
index 53e879215296ca0c1dcae20dcccdc6ad149b5b7f..83ee32ce04d6fc052bde2a6eeed87a8c8a9ceb14 100644
--- a/chrome/browser/ui/cocoa/history_overlay_controller.mm
+++ b/chrome/browser/ui/cocoa/history_overlay_controller.mm
@@ -89,13 +89,6 @@ const CGFloat kShieldHeightCompletionAdjust = 10;
return self;
}
-- (void)dealloc {
- [[BrowserWindowController
- browserWindowControllerForView:[self view]] onOverlappedViewHidden];
- [self.view removeFromSuperview];
- [super dealloc];
-}
Nico 2013/12/27 23:56:13 This was added in https://chromiumcodereview.appsp
erikchen 2013/12/30 19:20:34 I've manually tested the repro conditions with bot
-
- (void)loadView {
const gfx::Image& image =
ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
@@ -166,6 +159,9 @@ const CGFloat kShieldHeightCompletionAdjust = 10;
}
- (void)animationDidStop:(CAAnimation*)theAnimation finished:(BOOL)finished {
+ [[BrowserWindowController
+ browserWindowControllerForView:[self view]] onOverlappedViewHidden];
+ [self.view removeFromSuperview];
// Destroy the CAAnimation and its strong reference to its delegate (this
// class).
[self.view setAnimations:nil];

Powered by Google App Engine
This is Rietveld 408576698