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

Unified Diff: chrome/browser/search_engines/template_url.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: fixed indentation 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/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 43ca5902aded0ad2620646e63fe0402f6e9f8795..f5c7d215d77c00afdda6e2f54c4c132a005151ee 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -96,7 +96,9 @@ std::string TemplateURLRef::GetURL() const {
case SEARCH: return owner_->url();
case SUGGEST: return owner_->suggestions_url();
case INSTANT: return owner_->instant_url();
- default: NOTREACHED(); return std::string();
+ default:
Peter Kasting 2012/05/15 17:34:16 Nit: Don't touch this please
Isaac (away) 2012/05/15 19:44:41 it was giving me a presubmit warning for two comma
+ NOTREACHED();
+ return std::string();
}
}
@@ -213,7 +215,7 @@ std::string TemplateURLRef::ReplaceSearchTermsUsingTermsData(
// to happen so that we replace the RLZ template with the
// empty string. (If we don't handle this case, we hit a
// NOTREACHED below.)
-#if defined(ENABLE_RLZ)
+#if defined(ENABLE_RLZ) || defined(OS_ANDROID)
string16 rlz_string = search_terms_data.GetRlzParameterValue();
if (!rlz_string.empty()) {
url.insert(i->index, "rlz=" + UTF16ToUTF8(rlz_string) + "&");
« no previous file with comments | « chrome/browser/search_engines/search_terms_data.cc ('k') | chrome/browser/search_engines/template_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698