Use app_list_service_disabled in Athena

chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 88 matching lines @@
     WebstoreInstaller::Approval* approval = approvals_[i];
     if (approval->extension_id == id &&
         profile->IsSameProfile(approval->profile)) {
       approvals_.weak_erase(approvals_.begin() + i);
       return scoped_ptr<WebstoreInstaller::Approval>(approval);
     }
   }
   return scoped_ptr<WebstoreInstaller::Approval>();
 }
 
+chrome::HostDesktopType GetHostDesktopTypeForWebContents(
+    content::WebContents* contents) {
+  return chrome::GetHostDesktopTypeForNativeWindow(
+      contents->GetTopLevelNativeWindow());
+}
+
 static base::LazyInstance<PendingApprovals> g_pending_approvals =
     LAZY_INSTANCE_INITIALIZER;
 
 // A preference set by the web store to indicate login information for
 // purchased apps.
 const char kWebstoreLogin[] = "extensions.webstore_login";
 const char kAlreadyInstalledError[] = "This item is already installed";
 const char kCannotSpecifyIconDataAndUrlError[] =
     "You cannot specify both icon data and an icon url";
 const char kInvalidIconUrlError[] = "Invalid icon url";
@@ skipping 347 matching lines @@
                   .Pass();
   if (!approval_) {
     error_ = ErrorUtils::FormatErrorMessage(
         kNoPreviousBeginInstallWithManifestError, params->expected_id);
     return false;
   }
 
   scoped_active_install_.reset(new ScopedActiveInstall(
       InstallTracker::Get(GetProfile()), params->expected_id));
 
-  AppListService* app_list_service =
-      AppListService::Get(GetCurrentBrowser()->host_desktop_type());
+  AppListService* app_list_service = AppListService::Get(
+      GetHostDesktopTypeForWebContents(GetAssociatedWebContents()));
 
   if (approval_->enable_launcher) {
     app_list_service->EnableAppList(GetProfile(),
                                     AppListService::ENABLE_FOR_APP_INSTALL);
   }
 
   if (IsAppLauncherEnabled() && approval_->manifest->is_app()) {
     // Show the app list to show download is progressing. Don't show the app
     // list on first app install so users can be trained to open it themselves.
     app_list_service->ShowForAppInstall(
@@ skipping 73 matching lines @@
   SendResponse(true);
 }
 
 WebstorePrivateEnableAppLauncherFunction::
     WebstorePrivateEnableAppLauncherFunction() {}
 
 WebstorePrivateEnableAppLauncherFunction::
     ~WebstorePrivateEnableAppLauncherFunction() {}
 
 bool WebstorePrivateEnableAppLauncherFunction::RunSync() {
-  AppListService::Get(GetCurrentBrowser()->host_desktop_type())
-      ->EnableAppList(GetProfile(), AppListService::ENABLE_VIA_WEBSTORE_LINK);
+  AppListService* app_list_service = AppListService::Get(
+      GetHostDesktopTypeForWebContents(GetAssociatedWebContents()));
+  app_list_service->EnableAppList(GetProfile(),
+                                  AppListService::ENABLE_VIA_WEBSTORE_LINK);
   return true;
 }
 
 bool WebstorePrivateGetBrowserLoginFunction::RunSync() {
   GetBrowserLogin::Results::Info info;
   info.login = GetProfile()->GetOriginalProfile()->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
   results_ = GetBrowserLogin::Results::Create(info);
   return true;
 }
@@ skipping 167 matching lines @@
 WebstorePrivateGetEphemeralAppsEnabledFunction::
     ~WebstorePrivateGetEphemeralAppsEnabledFunction() {}
 
 bool WebstorePrivateGetEphemeralAppsEnabledFunction::RunSync() {
   results_ = GetEphemeralAppsEnabled::Results::Create(
       EphemeralAppLauncher::IsFeatureEnabled());
   return true;
 }
 
 }  // namespace extensions