Reload Local NTP on default search provider change.

chrome/browser/search/local_ntp_source.cc

 // Copyright 2013 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/local_ntp_source.h"
 
+#include "base/json/json_string_value_serializer.h"
 #include "base/logging.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/browser/search/instant_io_context.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Signifies a locally constructed resource, i.e. not from grit/.
 const int kLocalResource = -1;
 
-const char kTranslatedStringsFilename[] = "translated-strings.js";
+const char kConfigDataFilename[] = "config.js";
 
 const struct Resource{
   const char* filename;
   int identifier;
   const char* mime_type;
 } kResources[] = {
   { "local-ntp.html", IDR_LOCAL_NTP_HTML, "text/html" },
   { "local-ntp.js", IDR_LOCAL_NTP_JS, "application/javascript" },
-  { kTranslatedStringsFilename, kLocalResource, "application/javascript" },
+  { kConfigDataFilename, kLocalResource, "application/javascript" },
   { "local-ntp.css", IDR_LOCAL_NTP_CSS, "text/css" },
   { "images/close_2.png", IDR_CLOSE_2, "image/png" },
   { "images/close_2_hover.png", IDR_CLOSE_2_H, "image/png" },
   { "images/close_2_active.png", IDR_CLOSE_2_P, "image/png" },
   { "images/close_2_white.png", IDR_CLOSE_2_MASK, "image/png" },
   { "images/page_icon.png", IDR_LOCAL_OMNIBOX_POPUP_IMAGES_PAGE_ICON_PNG,
     "image/png" },
   { "images/2x/page_icon.png",
     IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_PAGE_ICON_PNG, "image/png" },
   { "images/search_icon.png",
@@ skipping 11 matching lines @@
   return path.substr(0, path.find("?"));
 }
 
 // Adds a localized string keyed by resource id to the dictionary.
 void AddString(base::DictionaryValue* dictionary,
                const std::string& key,
                int resource_id) {
   dictionary->SetString(key, l10n_util::GetStringUTF16(resource_id));
 }
 
-// Returns a JS dictionary of translated strings for the local NTP.
-std::string GetTranslatedStrings() {
-  base::DictionaryValue translated_strings;
+// Populates |translated_strings| dictionary for the local NTP.
+void GetTranslatedStrings(base::DictionaryValue* translated_strings) {
   if (chrome::ShouldShowRecentTabsOnNTP())
-    AddString(&translated_strings, "recentTabs", IDS_RECENT_TABS_MENU);
-  AddString(&translated_strings, "thumbnailRemovedNotification",
+    AddString(translated_strings, "recentTabs", IDS_RECENT_TABS_MENU);
+
+  AddString(translated_strings, "thumbnailRemovedNotification",
             IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION);
-  AddString(&translated_strings, "removeThumbnailTooltip",
+  AddString(translated_strings, "removeThumbnailTooltip",
             IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP);
-  AddString(&translated_strings, "undoThumbnailRemove",
+  AddString(translated_strings, "undoThumbnailRemove",
             IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE);
-  AddString(&translated_strings, "restoreThumbnailsShort",
+  AddString(translated_strings, "restoreThumbnailsShort",
             IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK);
-  AddString(&translated_strings, "attributionIntro",
+  AddString(translated_strings, "attributionIntro",
             IDS_NEW_TAB_ATTRIBUTION_INTRO);
-  AddString(&translated_strings, "title", IDS_NEW_TAB_TITLE);
-  std::string translated_strings_js;
-  webui::AppendJsonJS(&translated_strings, &translated_strings_js);
-  return translated_strings_js;
+  AddString(translated_strings, "title", IDS_NEW_TAB_TITLE);
+}
+
+// Returns a JS dictionary of configuration data for the local NTP.
+std::string GetConfigData(Profile* profile) {
+  base::DictionaryValue* translated_strings = new base::DictionaryValue();

[samarth, 2013/07/17 16:39:45]

Use a scoped_ptr here and then use .release() when you pass this to Set() below.

[kmadhusu, 2013/07/17 17:58:03]

Done.

+  GetTranslatedStrings(translated_strings);
+
+  // Configuration data.
+  base::DictionaryValue config_data;
+  config_data.Set("translatedStrings", translated_strings);
+  config_data.SetBoolean("isGooglePage",
+                         chrome::DefaultSearchProviderIsGoogle(profile));
+
+  // 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 configData = ");
+  config_data_js.append(js_text);
+  config_data_js.append(";");
+  return config_data_js;
 }
 
 }  // namespace
 
-LocalNtpSource::LocalNtpSource() {
+LocalNtpSource::LocalNtpSource(Profile* profile) : profile_(profile) {
 }
 
 LocalNtpSource::~LocalNtpSource() {
 }
 
 std::string LocalNtpSource::GetSource() const {
   return chrome::kChromeSearchLocalNtpHost;
 }
 
 void LocalNtpSource::StartDataRequest(
     const std::string& path,
     int render_process_id,
     int render_view_id,
     const content::URLDataSource::GotDataCallback& callback) {
   const std::string stripped_path = StripParameters(path);
-  if (stripped_path == kTranslatedStringsFilename) {
-    std::string translated_strings_js = GetTranslatedStrings();
-    callback.Run(base::RefCountedString::TakeString(&translated_strings_js));
+  if (stripped_path == kConfigDataFilename) {
+    std::string config_data_js = GetConfigData(profile_);
+    callback.Run(base::RefCountedString::TakeString(&config_data_js));
     return;
   }
   for (size_t i = 0; i < arraysize(kResources); ++i) {
     if (stripped_path == kResources[i].filename) {
       scoped_refptr<base::RefCountedStaticMemory> response(
           ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
               kResources[i].identifier));
       callback.Run(response.get());
       return;
     }
@@ skipping 26 matching lines @@
     }
   }
   return false;
 }
 
 std::string LocalNtpSource::GetContentSecurityPolicyFrameSrc() const {
   // Allow embedding of most visited iframes.
   return base::StringPrintf("frame-src %s;",
                             chrome::kChromeSearchMostVisitedUrl);
 }