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

Unified Diff: chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm

Issue 12210107: Fix issue 174250, crash when reloading packaged app. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: comments Created 7 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
« no previous file with comments | « chrome/browser/extensions/shell_window_registry.cc ('k') | chrome/browser/ui/extensions/shell_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm
index a3e565706016dab3ed62d71ce0f4a3b61b3b6f27..9593ea155295ec28454b7573742b5e39aac545ef 100644
--- a/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.mm
@@ -4,7 +4,9 @@
#include "chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h"
+#include "base/bind.h"
#include "base/mac/mac_util.h"
+#include "base/message_loop.h"
#include "base/sys_string_conversions.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/cocoa/browser_window_utils.h"
@@ -679,7 +681,13 @@ gfx::Insets NativeAppWindowCocoa::GetFrameInsets() const {
void NativeAppWindowCocoa::WindowWillClose() {
[window_controller_ setAppWindow:NULL];
shell_window_->OnNativeWindowChanged();
- shell_window_->OnNativeClose();
+ // On other platforms, the native window doesn't get destroyed synchronously.
+ // We simulate that here so that ShellWindow can assume that it doesn't get
+ // deleted immediately upon calling Close().
+ MessageLoop::current()->PostTask(
+ FROM_HERE,
+ base::Bind(&ShellWindow::OnNativeClose,
+ base::Unretained(shell_window_)));
}
void NativeAppWindowCocoa::WindowDidBecomeKey() {
« no previous file with comments | « chrome/browser/extensions/shell_window_registry.cc ('k') | chrome/browser/ui/extensions/shell_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698