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

chrome/browser/ui/views/clear_browsing_data.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/views/clear_browsing_data.h"
 
 #include "app/l10n_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 117 matching lines @@
   // Add a label which appears before the combo box for the time period.
   time_period_label_ = new views::Label(UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_TIME_LABEL)));
   AddChildView(time_period_label_);
 
   // Add the combo box showing how far back in time we want to delete.
   time_period_combobox_ = new views::Combobox(this);
   time_period_combobox_->SetSelectedItem(profile_->GetPrefs()->GetInteger(
                                          prefs::kDeleteTimePeriod));
   time_period_combobox_->set_listener(this);
-  time_period_combobox_->SetAccessibleName(time_period_label_->GetText());
+  time_period_combobox_->SetAccessibleName(
+      WideToUTF16Hack(time_period_label_->GetText()));
   AddChildView(time_period_combobox_);
 
   // Create the throbber and related views. The throbber and status link are
   // contained in throbber_view_, which is positioned by DialogClientView right
   // next to the buttons.
   throbber_view_ = new views::View();
 
   GridLayout* layout = new GridLayout(throbber_view_);
   throbber_view_->SetLayoutManager(layout);
   views::ColumnSet* column_set = layout->AddColumnSet(0);
@@ skipping 317 matching lines @@
   remover_->AddObserver(this);
   remover_->Remove(remove_mask);
 }
 
 void ClearBrowsingDataView::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   window()->Close();
 }