Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

Issue 12207104: Refactor app_list_util.h into AppListService abstract base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase (conflicts in webstore_private_api.cc) Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8fd924e61bd6aeaa41213bceeb792e04fdbadf60..58b1d886b71d8ddf16a549033bf4ee2cf79ce2c3 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -27,7 +27,7 @@
#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"
+#include "chrome/browser/ui/app_list/app_list_service.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -475,17 +475,15 @@ void CompleteInstallFunction::OnGetAppLauncherEnabled(
bool app_launcher_enabled) {
if (app_launcher_enabled) {
std::string name;
-#if defined(ENABLE_APP_LIST)
if (!approval_->parsed_manifest->GetString(extension_manifest_keys::kName,
&name)) {
NOTREACHED();
}
// Tell the app list about the install that we just started.
if (is_app_) {
- chrome::NotifyAppListOfBeginExtensionInstall(
+ AppListService::Get()->OnBeginExtensionInstall(
profile(), id, name, approval_->installing_icon);
}
-#endif
}
// The extension will install through the normal extension install flow, but
@@ -512,10 +510,8 @@ void CompleteInstallFunction::OnExtensionInstallFailure(
const std::string& id,
const std::string& error,
WebstoreInstaller::FailureReason reason) {
-#if defined(ENABLE_APP_LIST)
if (is_app_)
- chrome::NotifyAppListOfExtensionInstallFailure(profile(), id);
-#endif
+ AppListService::Get()->OnExtensionInstallFailure(profile(), id);
if (test_webstore_installer_delegate) {
test_webstore_installer_delegate->OnExtensionInstallFailure(
id, error, reason);
@@ -531,12 +527,10 @@ void CompleteInstallFunction::OnExtensionInstallFailure(
void CompleteInstallFunction::OnExtensionDownloadProgress(
const std::string& id,
content::DownloadItem* item) {
-#if defined(ENABLE_APP_LIST)
if (is_app_) {
- chrome::NotifyAppListOfDownloadProgress(profile(), id,
- item->PercentComplete());
+ AppListService::Get()->OnDownloadProgress(
+ profile(), id, item->PercentComplete());
}
-#endif
}
bool GetBrowserLoginFunction::RunImpl() {

Powered by Google App Engine
This is Rietveld 408576698