summaryrefslogtreecommitdiffstats
path: root/chrome/browser/rlz/rlz.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/rlz/rlz.h')
-rw-r--r--chrome/browser/rlz/rlz.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/rlz/rlz.h b/chrome/browser/rlz/rlz.h
index c335cbd..e30f8cc 100644
--- a/chrome/browser/rlz/rlz.h
+++ b/chrome/browser/rlz/rlz.h
@@ -16,6 +16,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/singleton.h"
+#include "base/string16.h"
#include "base/task.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
@@ -52,7 +53,7 @@ class RLZTracker : public NotificationObserver {
// Get the RLZ value of the access point.
// Returns false if the rlz string could not be obtained. In some cases
// an empty string can be returned which is not an error.
- static bool GetAccessPointRlz(rlz_lib::AccessPoint point, std::wstring* rlz);
+ static bool GetAccessPointRlz(rlz_lib::AccessPoint point, string16* rlz);
// Invoked during shutdown to clean up any state created by RLZTracker.
static void CleanupRlz();
@@ -94,7 +95,7 @@ class RLZTracker : public NotificationObserver {
bool google_default_homepage);
// Implementation called from RecordProductEvent() static method.
- bool GetAccessPointRlzImpl(rlz_lib::AccessPoint point, std::wstring* rlz);
+ bool GetAccessPointRlzImpl(rlz_lib::AccessPoint point, string16* rlz);
// Schedules the delayed initialization. This method is virtual to allow
// tests to override how the scheduling is done.
@@ -116,10 +117,9 @@ class RLZTracker : public NotificationObserver {
// Sends the financial ping to the RLZ servers. This method is virtual to
// allow tests to override.
- virtual bool SendFinancialPing(const std::wstring& brand,
- const std::wstring& lang,
- const std::wstring& referral,
- bool exclude_id);
+ virtual bool SendFinancialPing(const std::string& brand,
+ const string16& lang,
+ const string16& referral);
// Tracker used for testing purposes only. If this value is non-NULL, it
// will be returned from GetInstance() instead of the regular singleton.
@@ -139,7 +139,7 @@ class RLZTracker : public NotificationObserver {
// The cache must be protected by a lock since it may be accessed from
// the UI thread for reading and the IO thread for reading and/or writing.
base::Lock cache_lock_;
- std::map<rlz_lib::AccessPoint, std::wstring> rlz_cache_;
+ std::map<rlz_lib::AccessPoint, string16> rlz_cache_;
// Keeps track of whether the omnibox or host page have been used.
bool omnibox_used_;