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

chrome/browser/ui/views/options/options_window_view.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 179 matching lines @@
   // HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView, private:
 
 void OptionsWindowView::Init() {
   tabs_ = new views::TabbedPane;
-  tabs_->SetAccessibleName(UTF16ToWide(
-      l10n_util::GetStringFUTF16(IDS_OPTIONS_DIALOG_TITLE,
-                                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))));
+  tabs_->SetAccessibleName(l10n_util::GetStringFUTF16(
+      IDS_OPTIONS_DIALOG_TITLE,
+      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   tabs_->SetListener(this);
   AddChildView(tabs_);
 
   int tab_index = 0;
   GeneralPageView* general_page = new GeneralPageView(profile_);
   tabs_->AddTabAtIndex(
       tab_index++,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_GENERAL_TAB_LABEL)),
       general_page, false);
 
@@ skipping 26 matching lines @@
   // If there's already an existing options window, activate it and switch to
   // the specified page.
   // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care
   //             about this case this will have to be fixed.
   if (!instance_) {
     instance_ = new OptionsWindowView(profile);
     views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);
   }
   instance_->ShowOptionsPage(page, highlight_group);
 }