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

Unified Diff: chrome/browser/search_engines/search_terms_data.cc

Issue 10332156: Add ability to set RLZ statically for OS_ANDROID (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Splitting android functions in prep for client id upload Created 8 years, 7 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/browser/search_engines/search_terms_data.cc
diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc
index e74b29a842de714a98142a50b603865bae815707..195769a8dabdf856854cc2955a200ccf4f3b8846 100644
--- a/chrome/browser/search_engines/search_terms_data.cc
+++ b/chrome/browser/search_engines/search_terms_data.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/search_engines/search_terms_data.h"
+#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/metrics/field_trial.h"
#include "chrome/browser/browser_process.h"
@@ -18,6 +19,12 @@
#include "chrome/browser/rlz/rlz.h"
#endif
+#if defined(OS_ANDROID)
+namespace {
+ base::LazyInstance::Leaky<string16> g_static_rlz = LAZY_INSTANCE_INITIALIZER;
+}
+#endif
+
using content::BrowserThread;
SearchTermsData::SearchTermsData() {
@@ -58,6 +65,15 @@ std::string SearchTermsData::GetApplicationLocale() const {
string16 SearchTermsData::GetRlzParameterValue() const {
return string16();
}
+
+#elif defined(OS_ANDROID)
+string16 SearchTermsData::GetRlzParameterValue() const {
+ return g_static_rlz == NULL ? string16() : g_static_rlz.Get();
+}
+
+void SearchTermsData::SetStaticRlz(const string16& rlz) {
+ g_static_rlz.Get() = rlz;
+}
#endif
std::string SearchTermsData::InstantEnabledParam() const {

Powered by Google App Engine
This is Rietveld 408576698