Unescape ampersands in network names on network selection screen

chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

 // Copyright (c) 2012 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/chromeos/login/network_dropdown.h"
 
 #include <string>
 
+#include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/chromeos/network/network_icon.h"
 #include "ui/chromeos/network/network_icon_animation.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 // Timeout between consecutive requests to network library for network
 // scan.
 const int kNetworkScanIntervalSecs = 60;
 
+base::string16 UnescapeAmpersands(const base::string16& input) {
+  base::string16 str = input;
+  size_t found = str.find(base::ASCIIToUTF16("&&"));
+  while (found != base::string16::npos) {
+    str.replace(found, 2, base::ASCIIToUTF16("&"));
+    found = str.find(base::ASCIIToUTF16("&&"), found + 1);
+  }
+  return str;
+}
+
 }  // namespace
 
 namespace chromeos {
 
 // WebUI specific implementation of the NetworkMenu class.
 class NetworkMenuWebUI : public NetworkMenu {
  public:
   NetworkMenuWebUI(NetworkMenu::Delegate* delegate, content::WebUI* web_ui);
 
   // NetworkMenu override:
@@ skipping 40 matching lines @@
   base::ListValue* list = new base::ListValue();
   for (int i = 0; i < model->GetItemCount(); ++i) {
     ui::MenuModel::ItemType type = model->GetTypeAt(i);
     int id;
     if (type == ui::MenuModel::TYPE_SEPARATOR)
       id = -2;
     else
       id = model->GetCommandIdAt(i);
     base::DictionaryValue* item = new base::DictionaryValue();
     item->SetInteger("id", id);
-    item->SetString("label", model->GetLabelAt(i));
+    item->SetString("label", UnescapeAmpersands(model->GetLabelAt(i)));

[Nikita (slow), 2015/04/28 11:58:51]

Are these escaped while being part of MenuModel?

[Nikita (slow), 2015/04/28 11:58:51]

ReplaceSubstringsAfterOffset(&string, 0, "&&", "&");

[Dmitry Polukhin, 2015/04/28 13:23:09]

Done. Yes this escaping is required for real MenuModel use case.

     gfx::Image icon;
     if (model->GetIconAt(i, &icon)) {
       SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(
           web_ui_->GetDeviceScaleFactor()).sk_bitmap();
       item->SetString("icon", webui::GetBitmapDataUrl(icon_bitmap));
     }
     if (id >= 0) {
       item->SetBoolean("enabled", model->IsEnabledAt(i));
       const gfx::FontList* font_list = model->GetLabelFontListAt(i);
       if (font_list)
@@ skipping 98 matching lines @@
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 void NetworkDropdown::RequestNetworkScan() {
   NetworkHandler::Get()->network_state_handler()->RequestScan();
   Refresh();
 }
 
 }  // namespace chromeos