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/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 kLoadTimeDataFilename[] = "load-time-data.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" },
+  { kLoadTimeDataFilename, 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;
+// Returns a JS dictionary of load time data for the local NTP.
+std::string GetLoadTimeData(Profile* profile) {
+  base::DictionaryValue load_time_data;
   if (chrome::ShouldShowRecentTabsOnNTP())
-    AddString(&translated_strings, "recentTabs", IDS_RECENT_TABS_MENU);
-  AddString(&translated_strings, "thumbnailRemovedNotification",
+    AddString(&load_time_data, "recentTabs", IDS_RECENT_TABS_MENU);
+  AddString(&load_time_data, "thumbnailRemovedNotification",
             IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION);
-  AddString(&translated_strings, "removeThumbnailTooltip",
+  AddString(&load_time_data, "removeThumbnailTooltip",
             IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP);
-  AddString(&translated_strings, "undoThumbnailRemove",
+  AddString(&load_time_data, "undoThumbnailRemove",
             IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE);
-  AddString(&translated_strings, "restoreThumbnailsShort",
+  AddString(&load_time_data, "restoreThumbnailsShort",
             IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK);
-  AddString(&translated_strings, "attributionIntro",
+  AddString(&load_time_data, "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(&load_time_data, "title", IDS_NEW_TAB_TITLE);
+  load_time_data.SetBoolean("isGooglePage",

[samarth, 2013/07/12 17:16:06]

Rather than mixing these fields, please create a config like:
{ "isGooglePage": true,
  "translatedStrings": {"recentTabs": ...,
                        "title": ...,
                        ...}
}

[kmadhusu, 2013/07/15 22:21:51]

Done.

+                            chrome::DefaultSearchProviderIsGoogle(profile));
+  std::string load_time_data_js;
+  webui::AppendJsonJS(&load_time_data, &load_time_data_js);

[samarth, 2013/07/12 17:16:06]

AppendJsonJS [1] sets a variable called "templateData" to the json object which
doesn't really make sense we're passing it a general config variable. Just use
JSONStringValueSerializer directly here (perhaps in a helper) function and use
it to create a "var config = ..." string.

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/ui/webui/jstemplat...

[kmadhusu, 2013/07/15 22:21:51]

Done.

+  return load_time_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 == kLoadTimeDataFilename) {
+    std::string load_time_data_js = GetLoadTimeData(profile_);
+    callback.Run(base::RefCountedString::TakeString(&load_time_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);
 }