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

Unified Diff: chrome/browser/extensions/app_shortcut_manager.cc

Issue 12208146: [win] Remove app launcher install calls from app shortcut manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/extensions/app_shortcut_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/app_shortcut_manager.cc
diff --git a/chrome/browser/extensions/app_shortcut_manager.cc b/chrome/browser/extensions/app_shortcut_manager.cc
index d87bb4650ed7cb079c3fa53f17b1f05082aa31b0..219894b1155a7f0e89f0448934647a68e793cc0b 100644
--- a/chrome/browser/extensions/app_shortcut_manager.cc
+++ b/chrome/browser/extensions/app_shortcut_manager.cc
@@ -22,11 +22,6 @@
#include "skia/ext/image_operations.h"
#include "ui/base/resource/resource_bundle.h"
-#if defined(OS_WIN)
-#include "chrome/browser/extensions/app_host_installer_win.h"
-#include "chrome/installer/util/browser_distribution.h"
-#endif
-
namespace extensions {
AppShortcutManager::AppShortcutManager(Profile* profile)
@@ -50,20 +45,8 @@ void AppShortcutManager::Observe(int type,
details).ptr();
if (extension->is_platform_app() &&
extension->location() != Manifest::COMPONENT) {
-#if defined(OS_WIN)
- if (BrowserDistribution::GetDistribution()->AppHostIsSupported() &&
- extensions::AppHostInstaller::GetInstallWithLauncher()) {
- scoped_refptr<Extension> extension_ref(const_cast<Extension*>(
- extension));
- extensions::AppHostInstaller::EnsureAppHostInstalled(
- base::Bind(&AppShortcutManager::OnAppHostInstallationComplete,
- weak_factory_.GetWeakPtr(), extension_ref));
- } else {
- UpdateApplicationShortcuts(extension);
- }
-#else
- UpdateApplicationShortcuts(extension);
-#endif // defined(OS_WIN)
+ web_app::UpdateShortcutInfoAndIconForApp(*extension, profile_,
+ base::Bind(&web_app::UpdateAllShortcuts));
}
#endif // !defined(OS_MACOSX)
break;
@@ -79,24 +62,6 @@ void AppShortcutManager::Observe(int type,
}
}
-#if defined(OS_WIN)
-void AppShortcutManager::OnAppHostInstallationComplete(
- scoped_refptr<Extension> extension, bool app_host_install_success) {
- if (!app_host_install_success) {
- // Do not create shortcuts if App Host fails to install.
- LOG(ERROR) << "Application Runtime installation failed.";
- return;
- }
- UpdateApplicationShortcuts(extension);
-}
-#endif
-
-void AppShortcutManager::UpdateApplicationShortcuts(
- const Extension* extension) {
- web_app::UpdateShortcutInfoAndIconForApp(*extension, profile_,
- base::Bind(&web_app::UpdateAllShortcuts));
-}
-
void AppShortcutManager::DeleteApplicationShortcuts(
const Extension* extension) {
ShellIntegration::ShortcutInfo delete_info =
« no previous file with comments | « chrome/browser/extensions/app_shortcut_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698