summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-31 23:03:58 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-31 23:03:58 +0000
commitf1da126cc5d08a89949aa2129feeb9c1adf86bc2 (patch)
treea0083f1178607054d94ba6cc9d68a44874f0ac48
parent9f6d6f17eb09eb20cc5071ed3d839fd8d3785a98 (diff)
downloadchromium_src-f1da126cc5d08a89949aa2129feeb9c1adf86bc2.zip
chromium_src-f1da126cc5d08a89949aa2129feeb9c1adf86bc2.tar.gz
chromium_src-f1da126cc5d08a89949aa2129feeb9c1adf86bc2.tar.bz2
Change SafeBrowsing client name for Chromium.BUG=1296800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1601 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/safe_browsing/protocol_manager.cc7
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_blocking_page.cc8
2 files changed, 11 insertions, 4 deletions
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 80ac3a1..c1ed1b4 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -37,8 +37,11 @@ static const char* const kSbGetHashUrl =
static const char* const kSbNewKeyUrl =
"https://sb-ssl.google.com/safebrowsing/newkey?client=%s&appver=%d.%d&pver=2.1";
-// TODO(paulg): Change these values when we get close to launch.
-static const char* const kSbClientName = "googleclient";
+#if defined(GOOGLE_CHROME_BUILD)
+static const char* const kSbClientName = "googlechrome";
+#else
+static const char* const kSbClientName = "chromium";
+#endif
static const int kSbClientMajorVersion = 1;
static const int kSbClientMinorVersion = 0;
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 8d39465..2342827 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -24,9 +24,13 @@
// For malware interstitial pages, we link the problematic URL to Google's
// diagnostic page.
-// TODO(paulg): Change 'googleclient' to a proper client name before launch.
+#if defined(GOOGLE_CHROME_BUILD)
static const char* const kSbDiagnosticUrl =
- "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?site=%ls&client=googleclient";
+ "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?site=%ls&client=googlechrome";
+#else
+static const char* const kSbDiagnosticUrl =
+ "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?site=%ls&client=chromium";
+#endif
static const char* const kSbReportPhishingUrl =
"http://www.google.com/safebrowsing/report_error/";