Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/chromeos/login/take_photo_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 "chrome/browser/chromeos/login/take_photo_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 90 matching lines @@
   }
 
   void HideThrobber() {
     DCHECK(throbber_);
     throbber_->Stop();
     throbber_->SetVisible(false);
   }
 
   void SetMessage(const std::wstring& message) {
     DCHECK(message_);
-    message_->SetText(WideToUTF16Hack(message));
+    message_->SetText(message);
     message_->SetVisible(!message.empty());
     Layout();
   }
 
   // views::View override:
   virtual void Layout() {
     gfx::Size size = GetPreferredSize();
     if (throbber_->IsVisible()) {
       gfx::Size throbber_size = throbber_->GetPreferredSize();
       int throbber_x = (size.width() - throbber_size.width()) / 2;
@@ skipping 32 matching lines @@
       show_title_(true),
       delegate_(delegate) {
 }
 
 TakePhotoView::~TakePhotoView() {
 }
 
 void TakePhotoView::Init() {
   if (show_title_) {
     title_label_ = new views::Label(
-        l10n_util::GetStringUTF16(IDS_USER_IMAGE_SCREEN_TITLE));
+        UTF16ToWide(l10n_util::GetStringUTF16(IDS_USER_IMAGE_SCREEN_TITLE)));
     title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     title_label_->SetMultiLine(true);
     CorrectLabelFontSize(title_label_);
   }
 
   user_image_ = new CameraImageView();
   user_image_->SetImageSize(
       gfx::Size(login::kUserImageSize, login::kUserImageSize));
   user_image_->Init();
 
@@ skipping 126 matching lines @@
     snapshot_button_->SetImage(
         views::CustomButton::BS_NORMAL,
         ResourceBundle::GetSharedInstance().GetBitmapNamed(
             IDR_USER_IMAGE_CAPTURE));
     delegate_->OnCapturingStarted();
     snapshot_button_->SchedulePaint();
   }
 }
 
 }  // namespace chromeos