Index: chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
index 06e69df40e587410dc730d05bad69c18ca377ad3..0d5ea65726dada52cea9aaa8602a0de281e13d80 100644 |
--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
@@ -405,7 +405,8 @@ enum { |
windowShim_->panel()->manager()->Drag(deltaX); |
} |
-- (void)setPanelFrame:(NSRect)frame { |
+- (void)setPanelFrame:(NSRect)frame |
+ animate:(BOOL)animate { |
// Setup the whole window as the tracking area so that we can get notified |
// when the mouse enters or leaves the window. This will make us be able to |
// show or hide settings button accordingly. |
@@ -421,7 +422,7 @@ enum { |
[[[[self window] contentView] superview] |
addTrackingArea:windowTrackingArea_.get()]; |
- if (!animateOnBoundsChange_) { |
+ if (!animateOnBoundsChange_ || !animate) { |
[[self window] setFrame:frame display:YES animate:NO]; |
return; |
} |