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

chrome/browser/chromeos/login/user_image_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/user_image_view.h"
 
-#include <string>
-
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/default_images_view.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 23 matching lines @@
 const int kVerticalPadding = 10;
 // Color for splitter separating contents from OK button.
 const SkColor kSplitterColor = SkColorSetRGB(187, 195, 200);
 // Height for the splitter.
 const int kSplitterHeight = 1;
 
 // IDs of column sets for grid layout manager.
 enum ColumnSets {
   kTitleRow,     // Column set for screen title.
   kImagesRow,    // Column set for image from camera and snapshot button.
-  kSplitterRow,  // Place for the splitter.
+  kSplitterRow, // Place for the splitter.
   kButtonsRow,   // Column set for OK button.
 };
 
 views::View* CreateSplitter(const SkColor& color) {
   views::View* splitter = new views::View();
   splitter->set_background(views::Background::CreateSolidBackground(color));
   return splitter;
 }
 
 }  // namespace
@@ skipping 12 matching lines @@
 UserImageView::~UserImageView() {
 }
 
 void UserImageView::Init() {
   // Use rounded rect background.
   set_border(CreateWizardBorder(&BorderDefinition::kScreenBorder));
   views::Painter* painter = CreateWizardPainter(
       &BorderDefinition::kScreenBorder);
   set_background(views::Background::CreateBackgroundPainter(true, painter));
 
-  title_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT));
+  title_label_ = new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT)));
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   title_label_->SetMultiLine(true);
   CorrectLabelFontSize(title_label_);
 
   default_images_view_ = new DefaultImagesView(this);
   take_photo_view_ = new TakePhotoView(this);
   take_photo_view_->set_show_title(false);
 
   splitter_ = CreateSplitter(kSplitterColor);
 
@@ skipping 189 matching lines @@
     return;
   delegate_->StopCamera();
   ok_button_->SetEnabled(true);
   ok_button_->RequestFocus();
   take_photo_view_->SetImage(
       ResourceBundle::GetSharedInstance().GetBitmapNamed(
             kDefaultImageResources[image_index]));
 }
 
 }  // namespace chromeos