summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 21:36:11 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 21:36:11 +0000
commit3b6aa8b6ca80f33b3a5af490dc29e65f6d9a6dc4 (patch)
treecb3a85d96d53560f62c0b094ebbc02c97a07fc81 /chrome/browser/automation
parent262c3f2ea113d3fb4ffe535226cf172a6a108e82 (diff)
downloadchromium_src-3b6aa8b6ca80f33b3a5af490dc29e65f6d9a6dc4.zip
chromium_src-3b6aa8b6ca80f33b3a5af490dc29e65f6d9a6dc4.tar.gz
chromium_src-3b6aa8b6ca80f33b3a5af490dc29e65f6d9a6dc4.tar.bz2
Chrome should shut down cleanly when quit from the Dock icon menu, during
user logout, and during system restart and shutdown. MainMenu.xib changes (because you're not expected to parse nibs yourself): - The quit menu item's action is changed from the AppController object's -quit: method (which no longer exists) to the application object's -terminate: method (the Cocoa standard). - The application and owner object types are changed from NSApplication to CrApplication. - The application menu name is changed from Chromium to ^IDS_SHORT_PRODUCT_NAME. Cocoa doesn't use this anyway, it gets replaced at runtime with the localized value of CFBundleName, but we shouldn't have branding-specific strings in our nibs. BUG=18078 TEST=Use Chrome for a while, quit it from the Dock icon menu, and relaunch. You should NOT see the "Google Chrome didn't shut down correctly" info bar. Review URL: http://codereview.chromium.org/201121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_provider_list_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_provider_list_mac.mm b/chrome/browser/automation/automation_provider_list_mac.mm
index 4d408fd..2cfdb3f 100644
--- a/chrome/browser/automation/automation_provider_list_mac.mm
+++ b/chrome/browser/automation/automation_provider_list_mac.mm
@@ -4,10 +4,10 @@
#include "chrome/browser/automation/automation_provider_list.h"
-#import "chrome/browser/app_controller_mac.h"
+#import <AppKit/AppKit.h>
void AutomationProviderList::OnLastProviderRemoved() {
// We need to explicitly quit the application here because on Mac
// the controller holds an additional reference to g_browser_process.
- [[NSApp delegate] quit:nil];
+ [NSApp terminate:nil];
}