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

Unified Diff: chrome/browser/lifetime/application_lifetime_mac.mm

Issue 11066035: [Mac] During shutdown, do not post NSApplicationWillTerminateNotification twice. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: kill_me_now Created 8 years, 2 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/chrome_browser_application_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/lifetime/application_lifetime_mac.mm
diff --git a/chrome/browser/lifetime/application_lifetime_mac.mm b/chrome/browser/lifetime/application_lifetime_mac.mm
index 86b7fa28e49d51318db68ec0ddfec8d33a6dd0e5..0e6b0ce00eac414d46d982af1fa029ed0f05b91f 100644
--- a/chrome/browser/lifetime/application_lifetime_mac.mm
+++ b/chrome/browser/lifetime/application_lifetime_mac.mm
@@ -2,16 +2,43 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+// This file contains the penultimate pieces of the Mac shutdown puzzle. For
+// an in-depth overview of the Mac shutdown path, see the comment above
+// -[BrowserCrApplication terminate:].
+
#include "chrome/browser/lifetime/application_lifetime.h"
+#include "base/bind.h"
+#include "base/message_loop.h"
#include "chrome/browser/browser_shutdown.h"
#import "chrome/browser/chrome_browser_application_mac.h"
namespace browser {
+namespace {
+
+// A closure that is used to finalize application shutdown.
+void PerformTerminate() {
+ [[NSNotificationCenter defaultCenter]
+ postNotificationName:NSApplicationWillTerminateNotification
+ object:NSApp];
+}
+
+} // namespace
+
+// At this point, the user is trying to quit (or the system is forcing the
+// application to quit) and all browsers have been successfully closed. The
+// final step in shutdown is to post the NSApplicationWillTerminateNotification
+// to end the -[NSApplication run] event loop. That is performed via the
+// MessageLoop, since this can be called via the destruction path of the last
+// Browser object.
void HandleAppExitingForPlatform() {
- // Last browser is closed, so call back to controller to shutdown the app.
- chrome_browser_application_mac::Terminate();
+ static bool kill_me_now = false;
+ CHECK(!kill_me_now);
+ kill_me_now = true;
+
+ MessageLoop::current()->PostNonNestableTask(FROM_HERE,
+ base::Bind(&PerformTerminate));
}
} // namespace browser
« no previous file with comments | « chrome/browser/chrome_browser_application_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698