Some new tab ui fixes.

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 525 matching lines @@
 
   if (NewTabHTMLSource::first_view() &&
       (GetProfile()->GetPrefs()->GetInteger(prefs::kRestoreOnStartup) != 0 ||
        !GetProfile()->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage))) {
     NewTabHTMLSource::set_first_view(false);
   }
 
   if (NewTabUI::FirstRunDisabled())
     NewTabHTMLSource::set_first_run(false);
 
+  InitializeCSSCaches();
   if (GetProfile()->IsOffTheRecord()) {
     incognito_ = true;
 
     IncognitoTabHTMLSource* html_source = new IncognitoTabHTMLSource(
         GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar));
     ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(
             &chrome_url_data_manager,
             &ChromeURLDataManager::AddDataSource,
             html_source));
   } else {
     AddMessageHandler((new ShownSectionsHandler())->Attach(this));
     AddMessageHandler((new MostVisitedHandler())->Attach(this));
     AddMessageHandler((new RecentlyClosedTabsHandler())->Attach(this));
     AddMessageHandler((new MetricsHandler())->Attach(this));
     if (WebResourcesEnabled())
       AddMessageHandler((new TipsHandler())->Attach(this));
 
 #if !defined(OS_POSIX)
     if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
       AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
     }
 #endif
 
     AddMessageHandler((new NewTabPageSetHomepageHandler())->Attach(this));
 
-    InitializeCSSCaches();
     NewTabHTMLSource* html_source = new NewTabHTMLSource(GetProfile());
     bool posted = ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(
             &chrome_url_data_manager,
             &ChromeURLDataManager::AddDataSource,
             html_source));
     if (!posted) {
       html_source->AddRef();
       html_source->Release();  // Keep Valgrind happy in tests.
@@ skipping 317 matching lines @@
 
   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());
-
   // 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);
+  static const base::StringPiece template_data_placeholder(
+      "<!-- template data placeholder -->");

[Evan Martin, 2009/10/29 22:27:28]

FWIW, if you want to get really anal about this, this calls strlen on the
string.  I think string::find() would work with a plain const char[].  Also
kFooBar for consts.

+  size_t pos = new_tab_html.find(template_data_placeholder);
 
+  if (pos != base::StringPiece::npos) {
+    full_html_.assign(new_tab_html.data(), pos);
+    full_html_.append(json_html);
+    size_t after_offset = pos + template_data_placeholder.size();
+    full_html_.append(new_tab_html.data() + after_offset,
+                      new_tab_html.size() - after_offset);
+  } else {
+    NOTREACHED();
+    full_html_.assign(new_tab_html.data(), new_tab_html.size());
+  }
   jstemplate_builder::AppendI18nTemplateProcessHtml(&full_html_);
 }