Remove reliance on GetActiveDesktop from AppListService::Get()

chrome::GetActiveDesktop() should only be used in tests. On Windows 8
split-screen there are cases where it picks the incorrect desktop
resulting in the incorrect app launcher being used.

Callers of AppListService::Get() are now required to specify the correct
HostDesktopType to increase the likelihood that the correct app list is
returned.

BUG=303524
TEST=Have app launcher & exit from Chrome completely.
- Open Chrome on the Desktop, leave browser window there.
- Open Chrome from Windows 8 Mode. Open and close App Launcher in Ash.
- Go into split screen with Ash in a small part of the screen on the left.
- Open Windows Desktop on the right side. Open App Launcher from the taskbar.
-> App launcher should show in Desktop Mode, not Ash.

Review URL: https://codereview.chromium.org/27650002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230662 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 1 deletions

diff --git a/apps/app_shim/app_shim_handler_mac.cc b/apps/app_shim/app_shim_handler_mac.cc
index 6593155..f50acdb 100644
--- a/apps/app_shim/app_shim_handler_mac.cc
+++ b/apps/app_shim/app_shim_handler_mac.cc
@@ -25,8 +25,10 @@ namespace {
 void TerminateIfNoShellWindows() {
   bool shell_windows_left =
       apps::ShellWindowRegistry::IsShellWindowRegisteredInAnyProfile(0);
-  if (!shell_windows_left && !AppListService::Get()->IsAppListVisible())
+  if (!shell_windows_left && !AppListService::Get(
+          chrome::HOST_DESKTOP_TYPE_NATIVE)->IsAppListVisible()) {
     chrome::AttemptExit();
+  }
 }
 
 class AppShimHandlerRegistry : public content::NotificationObserver {