summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/util/browser_distribution.cc4
-rw-r--r--chrome/installer/util/browser_distribution.h2
-rw-r--r--chrome/installer/util/chrome_frame_distribution.cc5
-rw-r--r--chrome/installer/util/chrome_frame_distribution.h2
-rw-r--r--chrome/installer/util/google_chrome_distribution.cc5
-rw-r--r--chrome/installer/util/google_chrome_distribution.h2
-rw-r--r--chrome/installer/util/google_chrome_distribution_dummy.cc5
7 files changed, 25 insertions, 0 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 18dba7e..ce4d1c6 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -179,6 +179,10 @@ std::wstring BrowserDistribution::GetStatsServerURL() {
return L"";
}
+std::string BrowserDistribution::GetNetworkStatsServer() const {
+ return "";
+}
+
std::wstring BrowserDistribution::GetDistributionData(HKEY root_key) {
return L"";
}
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index c766a8a..fa0c9d6 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -88,6 +88,8 @@ class BrowserDistribution {
virtual std::wstring GetStatsServerURL();
+ virtual std::string GetNetworkStatsServer() const;
+
#if defined(OS_WIN)
virtual std::wstring GetDistributionData(HKEY root_key);
#endif
diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc
index 6dc84ea..7305fdc 100644
--- a/chrome/installer/util/chrome_frame_distribution.cc
+++ b/chrome/installer/util/chrome_frame_distribution.cc
@@ -85,6 +85,11 @@ std::wstring ChromeFrameDistribution::GetStatsServerURL() {
return L"https://clients4.google.com/firefox/metrics/collect";
}
+std::string ChromeFrameDistribution::GetNetworkStatsServer() const {
+ // TODO(rtenneti): Return the network stats server name.
+ return "";
+}
+
std::wstring ChromeFrameDistribution::GetUninstallLinkName() {
return L"Uninstall Chrome Frame";
}
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
index dca7086..f8078d4 100644
--- a/chrome/installer/util/chrome_frame_distribution.h
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -43,6 +43,8 @@ class ChromeFrameDistribution : public BrowserDistribution {
virtual std::wstring GetStatsServerURL() OVERRIDE;
+ virtual std::string GetNetworkStatsServer() const OVERRIDE;
+
virtual std::wstring GetUninstallLinkName() OVERRIDE;
virtual std::wstring GetUninstallRegPath() OVERRIDE;
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 89606d1..bb56cab 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -422,6 +422,11 @@ std::wstring GoogleChromeDistribution::GetStatsServerURL() {
return L"https://clients4.google.com/firefox/metrics/collect";
}
+std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
+ // TODO(rtenneti): Return the network stats server name.
+ return "";
+}
+
std::wstring GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
std::wstring sub_key(google_update::kRegPathClientState);
sub_key.append(L"\\");
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index 5586896..637b639 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -56,6 +56,8 @@ class GoogleChromeDistribution : public BrowserDistribution {
virtual std::wstring GetStatsServerURL() OVERRIDE;
+ virtual std::string GetNetworkStatsServer() const OVERRIDE;
+
// This method reads data from the Google Update ClientState key for
// potential use in the uninstall survey. It must be called before the
// key returned by GetVersionKey() is deleted.
diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc
index 496d264..19e2800 100644
--- a/chrome/installer/util/google_chrome_distribution_dummy.cc
+++ b/chrome/installer/util/google_chrome_distribution_dummy.cc
@@ -80,6 +80,11 @@ std::wstring GoogleChromeDistribution::GetStatsServerURL() {
return std::wstring();
}
+std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
+ NOTREACHED();
+ return std::string();
+}
+
std::wstring GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
NOTREACHED();
return std::wstring();