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 168 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 = AddCSSClass(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 = AddCSSClass(username, "profile-name");
       }
     }
   } 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 = AddCSSClass(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);
   StringValue sub_header_value(sub_header);
   StringValue icon_url_value(icon_url);
   web_ui_->CallJavascriptFunction(
       "updateLogin", header_value, sub_header_value, icon_url_value);
 }
 
+string16 NTPLoginHandler::AddCSSClass(std::string display_string,

[James Hawkins, 2011/12/12 19:09:18]

This does not need to be on the NTPLoginHandler class, and there does not need
to be two functions.

[James Hawkins, 2011/12/12 19:09:18]

Need a more descriptive (non-generic) name for the function.

[Tyler Breisacher (Chromium), 2011/12/12 19:15:02]

What would be a better class to put this in? Or should it just be a standalone
function?

[Tyler Breisacher (Chromium), 2011/12/12 19:15:02]

I made two separate functions because "username" at line 196 is a UTF-8 string,
but in the other two cases the display_string is a UTF-16 string. Is there a
better way to deal with this?

[James Hawkins, 2011/12/12 19:18:26]

Not all functions need to live on an object, and in fact most shouldn't if they
don't touch any part of the object.

Move the function into the unnamed namespace at the top of the file.

[James Hawkins, 2011/12/12 19:18:26]

UTF8ToUTF16

+                                      std::string css_class) {
+  return UTF8ToUTF16("<span class='" + css_class + "'>" +
+      net::EscapeForHTML(display_string) + "</span>");
+}
+
+string16 NTPLoginHandler::AddCSSClass(string16 display_string,
+                                      std::string css_class) {
+  return UTF8ToUTF16("<span class='" + css_class + "'>") +
+      net::EscapeForHTML(display_string) + UTF8ToUTF16("</span>");
+}
+
 // static
 bool NTPLoginHandler::ShouldShow(Profile* profile) {
 #if defined(OS_CHROMEOS)
   // For now we don't care about showing sync status on Chrome OS. The promo
   // UI and the avatar menu don't exist on that platform.
   return false;
 #else
   if (profile->IsOffTheRecord())
     return false;
 
@@ skipping 15 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));
 }