Remove wstring from views. Part 3: Switch accessibility strings to string16....

chrome/browser/ui/views/options/options_group_view.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 <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/ui/views/options/options_group_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "gfx/font.h"
 #include "gfx/native_theme_win.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
 #include "views/standard_layout.h"
 
@@ skipping 20 matching lines @@
   SkColor title_color = gfx::NativeTheme::instance()->GetThemeColorWithDefault(
       gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR,
       COLOR_WINDOWTEXT);
   title_label_->SetColor(title_color);
   title_label_->SetMultiLine(true);
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
-  SetAccessibleName(title);
-  contents->SetAccessibleName(title);
+  SetAccessibleName(WideToUTF16Hack(title));
+  contents->SetAccessibleName(WideToUTF16Hack(title));
 }
 
 OptionsGroupView::~OptionsGroupView() {
 }
 
 void OptionsGroupView::SetHighlighted(bool highlighted) {
   highlighted_ = highlighted;
   SchedulePaint();
 }
 
@@ skipping 69 matching lines @@
     const int single_column_layout_id = 1;
     column_set = layout->AddColumnSet(single_column_layout_id);
     column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                           GridLayout::USE_PREF, 0, 0);
 
     separator_ = new views::Separator;
     layout->StartRow(0, single_column_layout_id);
     layout->AddView(separator_);
   }
 }