Index: chrome/installer/util/browser_distribution.cc |
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc |
index 77b119f0204a1340f777fd619d62449b60e2c341..dd7918d8660f3a43bc7d0549947402b7500479b0 100644 |
--- a/chrome/installer/util/browser_distribution.cc |
+++ b/chrome/installer/util/browser_distribution.cc |
@@ -18,7 +18,6 @@ |
#include "chrome/common/chrome_icon_resources_win.h" |
#include "chrome/common/env_vars.h" |
#include "chrome/installer/util/app_registration_data.h" |
-#include "chrome/installer/util/chrome_app_host_distribution.h" |
#include "chrome/installer/util/chrome_frame_distribution.h" |
#include "chrome/installer/util/chromium_binaries_distribution.h" |
#include "chrome/installer/util/google_chrome_binaries_distribution.h" |
@@ -45,15 +44,12 @@ const wchar_t kCommandExecuteImplUuid[] = |
BrowserDistribution* g_browser_distribution = NULL; |
BrowserDistribution* g_chrome_frame_distribution = NULL; |
BrowserDistribution* g_binaries_distribution = NULL; |
-BrowserDistribution* g_chrome_app_host_distribution = NULL; |
BrowserDistribution::Type GetCurrentDistributionType() { |
- // TODO(erikwright): If the app host is installed, but not Chrome, perhaps |
- // this should return CHROME_APP_HOST. |
return BrowserDistribution::CHROME_BROWSER; |
} |
-} // end namespace |
+} // namespace |
BrowserDistribution::BrowserDistribution() |
: type_(CHROME_BROWSER), |
@@ -112,11 +108,6 @@ BrowserDistribution* BrowserDistribution::GetSpecificDistribution( |
&g_chrome_frame_distribution); |
break; |
- case CHROME_APP_HOST: |
- dist = GetOrCreateBrowserDistribution<ChromeAppHostDistribution>( |
- &g_chrome_app_host_distribution); |
- break; |
- |
default: |
DCHECK_EQ(CHROME_BINARIES, type); |
#if defined(GOOGLE_CHROME_BUILD) |
@@ -282,10 +273,6 @@ bool BrowserDistribution::GetCommandExecuteImplClsid( |
return true; |
} |
-bool BrowserDistribution::AppHostIsSupported() { |
- return false; |
-} |
- |
void BrowserDistribution::UpdateInstallStatus(bool system_install, |
installer::ArchiveType archive_type, |
installer::InstallStatus install_status) { |