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

views/window/custom_frame_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 "views/window/custom_frame_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
@@ skipping 60 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(minimize_button_(new ImageButton(this))),
       window_icon_(NULL),
       should_show_minmax_buttons_(false),
       should_show_client_edge_(false),
       frame_(frame) {
   InitClass();
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   close_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE)));
+      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
 
   // Close button images will be set in LayoutWindowControls().
   AddChildView(close_button_);
 
   restore_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCNAME_RESTORE)));
+      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_RESTORE));
   restore_button_->SetImage(CustomButton::BS_NORMAL,
                             rb.GetBitmapNamed(IDR_RESTORE));
   restore_button_->SetImage(CustomButton::BS_HOT,
                             rb.GetBitmapNamed(IDR_RESTORE_H));
   restore_button_->SetImage(CustomButton::BS_PUSHED,
                             rb.GetBitmapNamed(IDR_RESTORE_P));
   AddChildView(restore_button_);
 
   maximize_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE)));
+      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE));
   maximize_button_->SetImage(CustomButton::BS_NORMAL,
                              rb.GetBitmapNamed(IDR_MAXIMIZE));
   maximize_button_->SetImage(CustomButton::BS_HOT,
                              rb.GetBitmapNamed(IDR_MAXIMIZE_H));
   maximize_button_->SetImage(CustomButton::BS_PUSHED,
                              rb.GetBitmapNamed(IDR_MAXIMIZE_P));
   AddChildView(maximize_button_);
 
   minimize_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE)));
+      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE));
   minimize_button_->SetImage(CustomButton::BS_NORMAL,
                              rb.GetBitmapNamed(IDR_MINIMIZE));
   minimize_button_->SetImage(CustomButton::BS_HOT,
                              rb.GetBitmapNamed(IDR_MINIMIZE_H));
   minimize_button_->SetImage(CustomButton::BS_PUSHED,
                              rb.GetBitmapNamed(IDR_MINIMIZE_P));
   AddChildView(minimize_button_);
 
   views::WindowDelegate* d = frame_->GetDelegate();
   should_show_minmax_buttons_ = d->CanMaximize();
@@ skipping 456 matching lines @@
     title_font_ = new gfx::Font(app::win::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO(ben): need to resolve what font this is.
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }
 
 }  // namespace views