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

chrome/browser/ui/views/tabs/base_tab.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/tabs/base_tab.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 123 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_TAB_CLOSE));
   close_button_->SetImage(views::CustomButton::BS_HOT,
                           rb.GetBitmapNamed(IDR_TAB_CLOSE_H));
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetBitmapNamed(IDR_TAB_CLOSE_P));
   close_button_->SetTooltipText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_TOOLTIP_CLOSE_TAB)));
   close_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)));
+      l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   // Disable animation so that the red danger sign shows up immediately
   // to help avoid mis-clicks.
   close_button_->SetAnimationDuration(0);
   AddChildView(close_button_);
 
   SetContextMenuController(this);
 }
 
 BaseTab::~BaseTab() {
 }
 
 void BaseTab::SetData(const TabRendererData& data) {
   TabRendererData old(data_);
   data_ = data;
 
   if (data_.crashed) {
     if (!should_display_crashed_favicon_ && !IsPerformingCrashAnimation())
       StartCrashAnimation();
   } else {
     if (IsPerformingCrashAnimation())
       StopCrashAnimation();
     ResetCrashedFavIcon();
   }
 
   // Sets the accessible name for the tab.
-  SetAccessibleName(UTF16ToWide(data_.title));
+  SetAccessibleName(data_.title);
 
   DataChanged(old);
 
   Layout();
 }
 
 void BaseTab::UpdateLoadingAnimation(TabRendererData::NetworkState state) {
   // If this is an extension app and a command line flag is set,
   // then disable the throbber.
   throbber_disabled_ = data().app &&
@@ skipping 287 matching lines @@
 // static
 void BaseTab::InitResources() {
   static bool initialized = false;
   if (!initialized) {
     initialized = true;
     font_ = new gfx::Font(
         ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
     font_height_ = font_->GetHeight();
   }
 }