summaryrefslogtreecommitdiffstats
path: root/chrome/browser/app_controller_mac.mm
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-28 01:17:41 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-28 01:17:41 +0000
commitc987a24655fedc08f1e04ee79e06e3f0df25d03a (patch)
tree5c1516372e1c2f6e8738c8168240c2784e2eb133 /chrome/browser/app_controller_mac.mm
parent160b8f609544fed63af64d1c24e4a70dda725e0d (diff)
downloadchromium_src-c987a24655fedc08f1e04ee79e06e3f0df25d03a.zip
chromium_src-c987a24655fedc08f1e04ee79e06e3f0df25d03a.tar.gz
chromium_src-c987a24655fedc08f1e04ee79e06e3f0df25d03a.tar.bz2
Remove kDefaultHostDesktopType from browser_finder.cc.
This forces GetBrowserCount() and GetTabbedBrowserCount() to also take HostDesktopType; changed all consumers to provide desktop context in their query. Introducing GetTotalBrowserCountForProfile() which is like GetBrowserCount(), but cummulative over all desktops; used in two scenarios where the caller of the old GetBrowserCount() actually wanted to know whether all browsers for a given profile were gone from the p.o.v. of the browser process (i.e. accross all desktops). BUG=129187 Review URL: https://chromiumcodereview.appspot.com/12315094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
-rw-r--r--chrome/browser/app_controller_mac.mm6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 4fb994e..93e807c 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -365,8 +365,10 @@ void RecordLastRunAppBundlePath() {
}
- (void)didEndMainMessageLoop {
- DCHECK_EQ(0u, chrome::GetBrowserCount([self lastProfile]));
- if (!chrome::GetBrowserCount([self lastProfile])) {
+ DCHECK_EQ(0u, chrome::GetBrowserCount([self lastProfile],
+ chrome::HOST_DESKTOP_TYPE_NATIVE));
+ if (!chrome::GetBrowserCount([self lastProfile],
+ chrome::HOST_DESKTOP_TYPE_NATIVE)) {
// As we're shutting down, we need to nuke the TabRestoreService, which
// will start the shutdown of the NavigationControllers and allow for
// proper shutdown. If we don't do this, Chrome won't shut down cleanly,