Chromium Code Reviews| Index: chrome/browser/ui/panels/panel_browser_window_cocoa.mm |
| diff --git a/chrome/browser/ui/panels/panel_browser_window_cocoa.mm b/chrome/browser/ui/panels/panel_browser_window_cocoa.mm |
| index 68055408a59b89b6a19782634087fc97ab5f82c1..550f3b9c1781e35f633b3f55012d96372561c7ba 100644 |
| --- a/chrome/browser/ui/panels/panel_browser_window_cocoa.mm |
| +++ b/chrome/browser/ui/panels/panel_browser_window_cocoa.mm |
| @@ -8,6 +8,7 @@ |
| #include "chrome/browser/ui/browser.h" |
| #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
| #include "chrome/browser/ui/panels/panel.h" |
| +#include "chrome/browser/ui/panels/panel_manager.h" |
| #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h" |
| namespace { |
| @@ -102,13 +103,7 @@ void PanelBrowserWindowCocoa::ClosePanel() { |
| return; |
| NSWindow* window = [controller_ window]; |
| - NSRect frame = [window frame]; |
| - frame.size.height = kMinimumWindowSize; |
| - // TODO(dimich): make this async. Currently, multiple panels will serially |
| - // (and annoyingly) close when user exits Chrome. |
| - [window setFrame:frame display:YES animate:YES]; |
| - browser_->OnWindowClosing(); |
| - DestroyPanelBrowser(); // not immediately, though. |
| + [window performClose:controller_]; |
|
jennb
2011/08/19 21:46:12
I prefer to animate the window offscreen here, the
Dmitry Titov
2011/08/22 18:34:56
See comment at the top.
|
| } |
| void PanelBrowserWindowCocoa::ActivatePanel() { |
| @@ -164,9 +159,13 @@ Browser* PanelBrowserWindowCocoa::GetPanelBrowser() const { |
| void PanelBrowserWindowCocoa::DestroyPanelBrowser() { |
| [controller_ close]; |
| - controller_ = NULL; |
| } |
| +void PanelBrowserWindowCocoa::didCloseNativeWindow() { |
| + DCHECK(!isClosed()); |
| + panel_->manager()->Remove(panel_.get()); |
| + controller_ = NULL; |
| +} |
| // NativePanelTesting implementation. |
| // static |