Index: chrome/browser/extensions/api/webstore_private/webstore_private_api.cc |
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc |
index 0e424b48ddc5c12c25ae07d9d603b40217c94c2b..457844a6e2c0994bc1224122fe6401d3e85667c1 100644 |
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc |
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc |
@@ -30,12 +30,14 @@ |
#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" |
@@ -478,8 +480,12 @@ void CompleteInstallFunction::OnGetAppLauncherEnabled( |
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 |
} |
@@ -508,7 +514,11 @@ void CompleteInstallFunction::OnExtensionInstallFailure( |
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( |
@@ -526,8 +536,11 @@ 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 |
} |