Change NotifyAppList*() functions into observers on a ProfileKeyedService.

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 "apps/app_launcher.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/browser/gpu/gpu_feature_checker.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"

[benwells, 2013/02/18 07:56:36]

Is this include still needed?

[koz (OOO until 15th September), 2013/02/19 03:20:36]

Nope, good catch.

 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/error_utils.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/extensions/app_host_installer_win.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 416 matching lines @@
   apps::GetIsAppLauncherEnabled(base::Bind(
       &CompleteInstallFunction::OnGetAppLauncherEnabled, this,
       approval_->extension_id));
 }
 
 void CompleteInstallFunction::OnGetAppLauncherEnabled(
     std::string id,
     bool app_launcher_enabled) {
   if (app_launcher_enabled) {
     std::string name;
 #if defined(ENABLE_APP_LIST)

[benwells, 2013/02/18 07:56:36]

Should we kill the #if? This is nice and generic now.

[koz (OOO until 15th September), 2013/02/19 03:20:36]

Done.

     if (!approval_->parsed_manifest->GetString(extension_manifest_keys::kName,
                                                &name)) {
       NOTREACHED();
     }
     // Tell the app list about the install that we just started.
-    chrome::NotifyAppListOfBeginExtensionInstall(
-        profile(), id, name, approval_->installing_icon);
+    ExtensionInstallingDetails details(
+        id, name, approval_->installing_icon, true);
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_EXTENSION_INSTALL_BEGIN,
+        content::Source<Profile>(profile()),
+        content::Details<ExtensionInstallingDetails>(&details));
 #endif
   }
 
   // The extension will install through the normal extension install flow, but
   // the whitelist entry will bypass the normal permissions install dialog.
   scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller(
       profile(), this,
       &(dispatcher()->delegate()->GetAssociatedWebContents()->GetController()),
       id, approval_.Pass(), WebstoreInstaller::FLAG_NONE);
   installer->Start();
 }
 
 void CompleteInstallFunction::OnExtensionInstallSuccess(
     const std::string& id) {
   if (test_webstore_installer_delegate)
     test_webstore_installer_delegate->OnExtensionInstallSuccess(id);
 
   SendResponse(true);
 
   // Matches the AddRef in RunImpl().
   Release();
 }
 
 void CompleteInstallFunction::OnExtensionInstallFailure(
     const std::string& id,
     const std::string& error,
     WebstoreInstaller::FailureReason reason) {
 #if defined(ENABLE_APP_LIST)

[benwells, 2013/02/18 07:56:36]

Kill the #if, kill the #if, kill the #if.

[koz (OOO until 15th September), 2013/02/19 03:20:36]

Done.

-  chrome::NotifyAppListOfExtensionInstallFailure(profile(), id);
+    std::string extension_id(id);
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_EXTENSION_INSTALL_FAIL,
+        content::Source<Profile>(profile()),
+        content::Details<std::string>(&extension_id));
 #endif
   if (test_webstore_installer_delegate) {
     test_webstore_installer_delegate->OnExtensionInstallFailure(
         id, error, reason);
   }
 
   error_ = error;
   SendResponse(false);
 
   // Matches the AddRef in RunImpl().
   Release();
 }
 
 void CompleteInstallFunction::OnExtensionDownloadProgress(
     const std::string& id,
     content::DownloadItem* item) {
 #if defined(ENABLE_APP_LIST)

[benwells, 2013/02/18 07:56:36]

Die, #if, die!

[koz (OOO until 15th September), 2013/02/19 03:20:36]

Done.

-  chrome::NotifyAppListOfDownloadProgress(profile(), id,
-                                          item->PercentComplete());
+    std::pair<std::string, int> details(id, item->PercentComplete());
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_EXTENSION_INSTALL_FAIL,
+        content::Source<Profile>(profile()),
+        content::Details<std::pair<std::string, int> >(&details));
 #endif
 }
 
 bool GetBrowserLoginFunction::RunImpl() {
   SetResult(CreateLoginResult(profile_->GetOriginalProfile()));
   return true;
 }
 
 bool GetStoreLoginFunction::RunImpl() {
   ExtensionService* service =
@@ skipping 47 matching lines @@
       &GetIsLauncherEnabledFunction::OnIsLauncherCheckCompleted, this));
   return true;
 }
 
 void GetIsLauncherEnabledFunction::OnIsLauncherCheckCompleted(bool is_enabled) {
   SetResult(Value::CreateBooleanValue(is_enabled));
   SendResponse(true);
 }
 
 }  // namespace extensions