Add finch flag for rendering a recently closed link on the local ntp.

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/string_util.h"
 #include "base/stringprintf.h"
+#include "base/values.h"
+#include "chrome/browser/search/search.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.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"
 
 namespace {
 
 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" },
@@ skipping 16 matching lines @@
     IDR_LOCAL_NTP_IMAGES_WHITE_LOGO_PNG, "image/png" },
   { "images/2x/white_google_logo.png",
     IDR_LOCAL_NTP_IMAGES_2X_WHITE_LOGO_PNG, "image/png" },
 };
 
 // Strips any query parameters from the specified path.
 std::string StripParameters(const std::string& path) {
   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));
+}
+
 }  // namespace
 
 LocalNtpSource::LocalNtpSource() {
 }
 
 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);
   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);
+      if (strcmp(kResources[i].mime_type, "text/html") == 0) {

[samarth, 2013/05/03 04:52:45]

Check the IDR or filename instead of relying on a single html mime type.

[samarth, 2013/05/03 04:52:45]

Some sort of test for the new code could be nice.

[jeremycho, 2013/05/03 06:30:29]

Done.

[jeremycho, 2013/05/03 06:30:29]

Will work on this.

+        base::DictionaryValue translated_strings;
+        if (chrome::IsRecentlyClosedNTPLinkEnabled()) {
+          AddString(&translated_strings, "recentlyClosed",
+                    IDS_NEW_TAB_RECENTLY_CLOSED);
+        }
+        static const base::StringPiece html(ResourceBundle::GetSharedInstance()

[samarth, 2013/05/03 04:52:45]

Does this (static stringpiece) work?  Is the memory returned by
GetRawDataResource guaranteed to be valid across calls?

[jeremycho, 2013/05/03 06:30:29]

This idiom is used in other StartDataRequest functions, so I believe so.

On 2013/05/03 04:52:45, samarth wrote:

+             .GetRawDataResource(kResources[i].identifier));
+        std::string i18n_html =
+            webui::GetI18nTemplateHtml(html, &translated_strings);
+        callback.Run(base::RefCountedString::TakeString(&i18n_html));
+      } else {
+        scoped_refptr<base::RefCountedStaticMemory> response(
+            ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+                kResources[i].identifier));
+        callback.Run(response);
+      }
       return;
     }
   }
   callback.Run(NULL);
 };
 
 std::string LocalNtpSource::GetMimeType(
     const std::string& path) const {
   const std::string stripped_path = StripParameters(path);
   for (size_t i = 0; i < arraysize(kResources); ++i) {
@@ skipping 11 matching lines @@
     DCHECK(StartsWithASCII(request->url().path(), "/", true));
     std::string filename = request->url().path().substr(1);
     for (size_t i = 0; i < arraysize(kResources); ++i) {
       if (filename == kResources[i].filename)
         return true;
     }
   }
   return false;
 }
 
+bool LocalNtpSource::ShouldAddContentSecurityPolicy() const {

[samarth, 2013/05/03 04:52:45]

Umm, this is almost certainly a bad idea.  I assume this is because otherwise
you can't link to chrome:// pages.

Instead of doing this, try using NavigateContentWindow.

[jeremycho, 2013/05/03 06:30:29]

This is needed for webui::GetI18nTemplateHtml, which injects inline JS into the
html.  It's done elsewhere too, e.g.
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/pri...


On 2013/05/03 04:52:45, samarth wrote:

+ return false;
+}
+
 std::string LocalNtpSource::GetContentSecurityPolicyFrameSrc() const {
   // Allow embedding of chrome search suggestion host.
   return base::StringPrintf("frame-src %s://%s/;",
                             chrome::kChromeSearchScheme,
                             chrome::kChromeSearchSuggestionHost);
 }