NTP: Fix startup visual state ...

chrome/browser/dom_ui/new_tab_ui.cc

 // Copyright (c) 2006-2009 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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include <set>
 
@@ skipping 1180 matching lines @@
     profile_->GetPrefs()->SetInteger(prefs::kNTPThemePromoRemaining,
         profile_->GetPrefs()->GetInteger(prefs::kNTPThemePromoRemaining) - 1);
     first_view_ = false;
   }
 
   // Control fade and resize animations.
   std::wstring anim =
       Animation::ShouldRenderRichAnimation() ? L"true" : L"false";
   localized_strings.SetString(L"anim", anim);
 
+  // Pass the shown_sections pref early so that we can prevent flicker.
+  const int shown_sections = profile_->GetPrefs()->GetInteger(
+      prefs::kNTPShownSections);
+  localized_strings.SetInteger(L"shown_sections", shown_sections);
+
   // In case we have the new new tab page enabled we first try to read the file
   // provided on the command line. If that fails we just get the resource from
   // the resource bundle.
   base::StringPiece new_tab_html;
   std::string new_tab_html_str;
   new_tab_html_str = GetCustomNewTabPageFromCommandLine();
 
   if (!new_tab_html_str.empty()) {
     new_tab_html = base::StringPiece(new_tab_html_str);
   }
 
   if (new_tab_html.empty()) {
     new_tab_html = ResourceBundle::GetSharedInstance().GetRawDataResource(
         IDR_NEW_NEW_TAB_HTML);
   }
 
   full_html_.assign(new_tab_html.data(), new_tab_html.size());
-  jstemplate_builder::AppendJsonHtml(&localized_strings, &full_html_);
-  jstemplate_builder::AppendI18nTemplateSourceHtml(&full_html_);
+
+  // Inject the template data into the HTML so that it is available before any
+  // layout is needed.
+  std::string json_html;
+  jstemplate_builder::AppendJsonHtml(&localized_strings, &json_html);
+
+  static const std::string template_data_placeholder =
+      "<!-- template data placeholder -->";
+  ReplaceFirstSubstringAfterOffset(&full_html_, 0, template_data_placeholder,
+      json_html);
+
   jstemplate_builder::AppendI18nTemplateProcessHtml(&full_html_);
 }