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

Unified Diff: chrome/browser/ui/panels/panel_browser_window_cocoa.mm

Issue 7694014: Reland: Implement correct Panel closing sequence for Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed random result of CreateClose unittest caused by using a freed object. Created 9 years, 4 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/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 b94b3775d0a55e64e185cc07eb6e43150e94d055..3e7521ff0212634ad53a81756e7cd01c30d99695 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"
#include "content/common/native_web_keyboard_event.h"
@@ -103,13 +104,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_];
}
void PanelBrowserWindowCocoa::ActivatePanel() {
@@ -176,9 +171,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
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_window_cocoa.h ('k') | chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698