[Search] Add a header image to the promo flow.

chrome/browser/search/contextual_search_promo_source_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search/contextual_search_promo_source_android.h"
 

[huangs, 2014/09/23 13:44:38]

#include <string> ?

[Mathieu, 2014/09/23 13:50:08]

Done.

+#include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
+#include "components/variations/variations_associated_data.h"
 #include "grit/browser_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "url/gurl.h"
 
 namespace {
 
+const char kPromoConfigPath[] = "/config.js";
 const char kPromoHTMLPath[] = "/promo.html";
 const char kPromoCSSPath[] = "/promo.css";
 const char kPromoJSPath[] = "/promo.js";
 const char kRobotoWoffPath[] = "/roboto.woff";
 const char kRobotoWoff2Path[] = "/roboto.woff2";
 
+// Field trial related constants.
+const char kContextualSearchFieldTrialName[] = "ContextualSearch";
+const char kContextualSearchHidePromoHeaderParam[] = "hide_promo_header";
+const char kContextualSearchEnabledValue[] = "enabled";
+
+// Returns whether we should hide the first-run promo header.
+bool ShouldHidePromoHeader() {
+  return variations::GetVariationParamValue(
+      kContextualSearchFieldTrialName, kContextualSearchHidePromoHeaderParam) ==
+          kContextualSearchEnabledValue;
+}
+
+// Returns a JS dictionary of configuration data for the Contextual Search
+// promo.
+std::string GetConfigData() {
+  base::DictionaryValue config_data;
+  config_data.SetBoolean("hideHeader", ShouldHidePromoHeader());
+
+  // Serialize the dictionary.
+  std::string js_text;
+  JSONStringValueSerializer serializer(&js_text);
+  serializer.Serialize(config_data);
+
+  std::string config_data_js;
+  config_data_js.append("var config = ");

[huangs, 2014/09/23 13:44:38]

Is |config| a global constant?  Maybe |CONFIG| instead, or a more specialized
name to avoid collision?  Your call.

[Mathieu, 2014/09/23 13:50:08]

In this limited scope, I think it's fine.

+  config_data_js.append(js_text);
+  config_data_js.append(";");
+  return config_data_js;
+}
+
 }  // namespace
 
 ContextualSearchPromoSourceAndroid::ContextualSearchPromoSourceAndroid() {}
 
 ContextualSearchPromoSourceAndroid::~ContextualSearchPromoSourceAndroid() {}
 
 void ContextualSearchPromoSourceAndroid::StartDataRequest(
     const std::string& path_and_query, int render_process_id,
     int render_frame_id,
     const content::URLDataSource::GotDataCallback& callback) {
   GURL url(std::string(chrome::kChromeUIContextualSearchPromoURL) + "/" +
            path_and_query);
   std::string path(url.path());
   if (path == kPromoHTMLPath) {
     SendHtmlWithStrings(callback);
   } else if (path == kPromoCSSPath) {
     SendResource(IDR_CONTEXTUAL_SEARCH_PROMO_CSS, callback);
   } else if (path == kPromoJSPath) {
     SendResource(IDR_CONTEXTUAL_SEARCH_PROMO_JS, callback);
+  } else if (path == kPromoConfigPath) {
+    SendConfigResource(callback);
   } else if (path == kRobotoWoffPath) {
     SendResource(IDR_ROBOTO_WOFF, callback);
   } else if (path == kRobotoWoff2Path) {
     SendResource(IDR_ROBOTO_WOFF2, callback);
   } else {
     callback.Run(NULL);
   }
 }
 
 std::string ContextualSearchPromoSourceAndroid::GetSource() const {
@@ skipping 21 matching lines @@
   return false;
 }
 
 void ContextualSearchPromoSourceAndroid::SendResource(
     int resource_id, const content::URLDataSource::GotDataCallback& callback) {
   scoped_refptr<base::RefCountedStaticMemory> response(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id));
   callback.Run(response.get());
 }
 
+void ContextualSearchPromoSourceAndroid::SendConfigResource(
+    const content::URLDataSource::GotDataCallback& callback) {
+  std::string response = GetConfigData();
+  callback.Run(base::RefCountedString::TakeString(&response));
+}
+
 void ContextualSearchPromoSourceAndroid::SendHtmlWithStrings(
     const content::URLDataSource::GotDataCallback& callback) {
   base::DictionaryValue strings_data;
   strings_data.SetString(
       "description",
       l10n_util::GetStringUTF16(IDS_CONTEXTUAL_SEARCH_PROMO_DESCRIPTION));
   strings_data.SetString(
       "heading", l10n_util::GetStringUTF16(IDS_CONTEXTUAL_SEARCH_HEADER));
   strings_data.SetString(
       "optIn", l10n_util::GetStringUTF16(IDS_CONTEXTUAL_SEARCH_PROMO_OPTIN));
   strings_data.SetString(
       "optOut", l10n_util::GetStringUTF16(IDS_CONTEXTUAL_SEARCH_PROMO_OPTOUT));
   base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
          IDR_CONTEXTUAL_SEARCH_PROMO_HTML));
   webui::UseVersion2 version;
   std::string response(webui::GetI18nTemplateHtml(html, &strings_data));
   callback.Run(base::RefCountedString::TakeString(&response));
 }