Clean up async app launcher enabled checks.

chrome/browser/ui/extensions/extension_install_ui_default.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/ui/extensions/extension_install_ui_default.h"
 
 #include "apps/app_launcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 52 matching lines @@
   return browser;
 }
 
 void ShowExtensionInstalledBubble(const extensions::Extension* extension,
                                   Profile* profile,
                                   const SkBitmap& icon) {
   Browser* browser = FindOrCreateVisibleBrowser(profile);
   chrome::ShowExtensionInstalledBubble(extension, browser, icon);
 }
 
-void OnAppLauncherEnabledCompleted(const extensions::Extension* extension,
-                                   Profile* profile,
-                                   SkBitmap* icon,
-                                   bool use_bubble,
-                                   bool use_launcher) {
-  if (use_launcher) {
-    AppListService::Get()->ShowAppList(profile);
-
-    content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST,
-        content::Source<Profile>(profile),
-        content::Details<const std::string>(&extension->id()));
-    return;
-  }
-
-  if (use_bubble) {
-    ShowExtensionInstalledBubble(extension, profile, *icon);
-    return;
-  }
-
-  ExtensionInstallUI::OpenAppInstalledUI(profile, extension->id());
-}
-
-
 // ErrorInfobarDelegate -------------------------------------------------------
 
 // Helper class to put up an infobar when installation fails.
 class ErrorInfobarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Creates an error delegate and adds it to |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      const extensions::CrxInstallerError& error);
 
  private:
@@ skipping 151 matching lines @@
   Profile* current_profile = profile_->GetOriginalProfile();
   if (extension->is_app()) {
     bool use_bubble = false;
 
 #if defined(TOOLKIT_VIEWS)  || defined(OS_MACOSX)
     CommandLine* cmdline = CommandLine::ForCurrentProcess();
     use_bubble = (use_app_installed_bubble_ ||
                   cmdline->HasSwitch(switches::kAppsNewInstallBubble));
 #endif
 
-    apps::GetIsAppLauncherEnabled(
-        base::Bind(&OnAppLauncherEnabledCompleted, extension, current_profile,
-                   icon, use_bubble));
+    if (apps::IsAppLauncherEnabled()) {
+      AppListService::Get()->ShowAppList(current_profile);
+
+      content::NotificationService::current()->Notify(
+          chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST,
+          content::Source<Profile>(current_profile),
+          content::Details<const std::string>(&extension->id()));
+      return;
+    }
+
+    if (use_bubble) {
+      ShowExtensionInstalledBubble(extension, current_profile, *icon);
+      return;
+    }
+
+    ExtensionInstallUI::OpenAppInstalledUI(current_profile, extension->id());
     return;
   }
 
   ShowExtensionInstalledBubble(extension, current_profile, *icon);
 }
 
 void ExtensionInstallUIDefault::OnInstallFailure(
     const extensions::CrxInstallerError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (disable_failure_ui_for_tests || skip_post_install_ui_)
@@ skipping 11 matching lines @@
                                error);
 }
 
 void ExtensionInstallUIDefault::SetSkipPostInstallUI(bool skip_ui) {
   skip_post_install_ui_ = skip_ui;
 }
 
 void ExtensionInstallUIDefault::SetUseAppInstalledBubble(bool use_bubble) {
   use_app_installed_bubble_ = use_bubble;
 }