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

Unified Diff: chrome/installer/util/chromium_binaries_distribution.cc

Issue 10665002: Implement installation of the Chrome App Host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A basic working app host installer/uninstaller. Created 8 years, 5 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/installer/util/chromium_binaries_distribution.cc
diff --git a/chrome/installer/util/chromium_binaries_distribution.cc b/chrome/installer/util/chromium_binaries_distribution.cc
index e12f56b2b8503a0515a9967cf3d5ab660d4203d2..0ae3e125dc7796f3a1cfb475160f4f6b755528d7 100644
--- a/chrome/installer/util/chromium_binaries_distribution.cc
+++ b/chrome/installer/util/chromium_binaries_distribution.cc
@@ -7,11 +7,13 @@
#include "chrome/installer/util/google_chrome_binaries_distribution.h"
#include "base/logging.h"
+#include "chrome/installer/util/l10n_string_util.h"
+
+#include "installer_util_strings.h" // NOLINT
namespace {
const wchar_t kChromiumBinariesName[] = L"Chromium Binaries";
-
} // namespace
ChromiumBinariesDistribution::ChromiumBinariesDistribution()
@@ -25,22 +27,23 @@ string16 ChromiumBinariesDistribution::GetAppGuid() {
}
string16 ChromiumBinariesDistribution::GetBaseAppName() {
- NOTREACHED();
- return string16();
+ return L"Chromium Binaries";
}
-string16 ChromiumBinariesDistribution::GetAppShortCutName() {
- return kChromiumBinariesName;
+string16 ChromiumBinariesDistribution::GetBaseAppId() {
+ return L"Chromium Binaries";
}
-string16 ChromiumBinariesDistribution::GetAlternateApplicationName() {
- NOTREACHED();
- return string16();
+string16 ChromiumBinariesDistribution::GetAppShortCutName() {
+ const string16& product_name =
+ installer::GetLocalizedString(IDS_PRODUCT_BINARIES_NAME_BASE);
+ return product_name;
}
-string16 ChromiumBinariesDistribution::GetBaseAppId() {
- NOTREACHED();
- return string16();
+string16 ChromiumBinariesDistribution::GetAlternateApplicationName() {
+ const string16& product_name =
+ installer::GetLocalizedString(IDS_PRODUCT_BINARIES_NAME_BASE);
+ return product_name;
}
string16 ChromiumBinariesDistribution::GetInstallSubDir() {
@@ -48,23 +51,21 @@ string16 ChromiumBinariesDistribution::GetInstallSubDir() {
}
string16 ChromiumBinariesDistribution::GetPublisherName() {
- NOTREACHED();
- return string16();
+ const string16& publisher_name =
+ installer::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
+ return publisher_name;
}
string16 ChromiumBinariesDistribution::GetAppDescription() {
- NOTREACHED();
- return string16();
+ return L"Shared components for Chromium products.";
}
string16 ChromiumBinariesDistribution::GetLongAppDescription() {
- NOTREACHED();
- return string16();
+ return L"Shared components for Chromium products.";
}
std::string ChromiumBinariesDistribution::GetSafeBrowsingName() {
- NOTREACHED();
- return std::string();
+ return "chromiumbinaries";
}
string16 ChromiumBinariesDistribution::GetStateKey() {
@@ -76,13 +77,12 @@ string16 ChromiumBinariesDistribution::GetStateMediumKey() {
}
string16 ChromiumBinariesDistribution::GetUninstallLinkName() {
- NOTREACHED();
- return string16();
+ return L"Uninstall Chromium Binaries";
grt (UTC plus 2) 2012/07/12 18:37:10 why?
Jói 2012/07/13 14:07:41 No localization on this or other user-visible mess
erikwright (departed) 2012/07/16 20:13:11 Some of these NOTREACHED were being hit even thoug
erikwright (departed) 2012/07/16 20:13:11 They were not actually user-visible. In any case,
}
string16 ChromiumBinariesDistribution::GetUninstallRegPath() {
- NOTREACHED();
- return string16();
+ return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
grt (UTC plus 2) 2012/07/12 18:37:10 the binaries show up in add/remove?
erikwright (departed) 2012/07/16 20:13:11 Done.
+ L"Google Chromium Binaries";
grt (UTC plus 2) 2012/07/12 18:37:10 this shouldn't have "Google" in the name, although
erikwright (departed) 2012/07/16 20:13:11 Done.
}
string16 ChromiumBinariesDistribution::GetVersionKey() {
@@ -90,16 +90,21 @@ string16 ChromiumBinariesDistribution::GetVersionKey() {
}
bool ChromiumBinariesDistribution::CanSetAsDefault() {
- NOTREACHED();
return false;
}
-int ChromiumBinariesDistribution::GetIconIndex() {
- NOTREACHED();
- return 0;
+bool ChromiumBinariesDistribution::CanCreateDesktopShortcuts() {
+ return false;
+}
+
+bool ChromiumBinariesDistribution::GetDelegateExecuteHandlerData(
+ string16* handler_class_uuid,
+ string16* type_lib_uuid,
+ string16* type_lib_version,
+ string16* interface_uuid) {
+ return false;
}
bool ChromiumBinariesDistribution::GetChromeChannel(string16* channel) {
- NOTREACHED();
return false;
}

Powered by Google App Engine
This is Rietveld 408576698