Follow-up to bug 102685 (r113862)

chrome/browser/ui/webui/ntp/ntp_login_handler.cc

 // Copyright (c) 2011 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/ui/webui/ntp/ntp_login_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 42 matching lines @@
 
   gfx::CanvasSkia canvas(length, length, false);
   canvas.DrawBitmapInt(bmp, 0, 0);
 
   // Draw a gray border on the inside of the icon.
   SkColor color = SkColorSetARGB(83, 0, 0, 0);
   canvas.DrawRectInt(color, 0, 0, length - 1, length - 1);
 
   return canvas.ExtractBitmap();
 }
 

[Tyler Breisacher (Chromium), 2011/12/12 19:35:05]

I'm not that happy with this name, other ideas are definitely welcome.

[Evan Stade, 2011/12/12 19:48:59]

CreateSpanWithClass(content, css_class)

[Tyler Breisacher (Chromium), 2011/12/12 23:04:24]

Done.

+// Put the display_string into a span with the given CSS class.
+string16 InsertIntoSpanWithClass(string16 display_string,
+                                 std::string css_class) {

[Evan Stade, 2011/12/12 19:35:52]

const ref on the parameters

[Tyler Breisacher (Chromium), 2011/12/12 23:04:24]

Done.

+  return UTF8ToUTF16("<span class='" + css_class + "'>") +

[Evan Stade, 2011/12/12 19:35:52]

both of these should be ASCIITo

[Tyler Breisacher (Chromium), 2011/12/12 23:04:24]

Done.

+      net::EscapeForHTML(display_string) + UTF8ToUTF16("</span>");
+}
+
 } // namespace
 
 NTPLoginHandler::NTPLoginHandler() {
 }
 
 NTPLoginHandler::~NTPLoginHandler() {
 }
 
 WebUIMessageHandler* NTPLoginHandler::Attach(WebUI* web_ui) {
   PrefService* pref_service = Profile::FromWebUI(web_ui)->GetPrefs();
@@ skipping 105 matching lines @@
   if (!username.empty()) {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
     if (profile_index != std::string::npos) {
       // Only show the profile picture and full name for the single profile
       // case. In the multi-profile case the profile picture is visible in the
       // title bar and the full name can be ambiguous.
       if (cache.GetNumberOfProfiles() == 1) {
         string16 name = cache.GetGAIANameOfProfileAtIndex(profile_index);
-        header = ASCIIToUTF16("<span class='profile-name'>") +
-                 net::EscapeForHTML(name) +
-                 ASCIIToUTF16("</span>");
+        header = InsertIntoSpanWithClass(name, "profile-name");
         const gfx::Image* image =
             cache.GetGAIAPictureOfProfileAtIndex(profile_index);
         if (image)
           icon_url = web_ui_util::GetImageDataUrl(GetGAIAPictureForNTP(*image));
       }
       if (header.empty()) {
-        header = UTF8ToUTF16("<span class='profile-name'>" +
-                             net::EscapeForHTML(username) + "</span>");
+        header = InsertIntoSpanWithClass(UTF8ToUTF16(username), "profile-name");
       }

[Evan Stade, 2011/12/12 19:48:59]

no curlies

[Tyler Breisacher (Chromium), 2011/12/12 23:04:24]

Done.

     }
   } else if (SyncPromoUI::ShouldShowSyncPromo(profile) &&
              (SyncPromoUI::UserHasSeenSyncPromoAtStartup(profile) ||
               PromoResourceService::CanShowNTPSignInPromo(profile))) {
     string16 signed_in_link = l10n_util::GetStringUTF16(
         IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK);
-    signed_in_link = ASCIIToUTF16("<span class='link-span'>") +
-                     net::EscapeForHTML(signed_in_link) +
-                     ASCIIToUTF16("</span>");
+    signed_in_link = InsertIntoSpanWithClass(signed_in_link, "link-span");
     header = l10n_util::GetStringFUTF16(
         IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_HEADER,
         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
     sub_header = l10n_util::GetStringFUTF16(
         IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_SUB_HEADER, signed_in_link);
     // Record that the user was shown the promo.
     RecordInHistogram(NTP_SIGN_IN_PROMO_VIEWED);
   }
 
   StringValue header_value(header);
@@ skipping 31 matching lines @@
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
   values->SetString("login_status_url",
       google_util::StringAppendGoogleLocaleParam(chrome::kSyncLearnMoreURL));
   values->SetString("login_status_learn_more",
       l10n_util::GetStringUTF16(IDS_LEARN_MORE));
   values->SetString("login_status_advanced",
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
   values->SetString("login_status_dismiss",
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
 }