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

chrome/browser/chromeos/login/web_page_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/web_page_view.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 99 matching lines @@
       views::Background::CreateBackgroundPainter(true, painter));
   set_border(CreateWizardBorder(&BorderDefinition::kScreenBorder));
   dom_view()->SetVisible(false);
   AddChildView(dom_view());
 
   throbber_ = CreateDefaultThrobber();
   AddChildView(throbber_);
 
   connecting_label_ = new views::Label();
   connecting_label_->SetText(
-      l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING)));
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   connecting_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
   connecting_label_->SetVisible(false);
-  AddChildView(connecting_label_);
+  AddChildView(connecting_label_ );
 
   start_timer_.Start(FROM_HERE,
                      TimeDelta::FromMilliseconds(kStartDelayMs),
                      this,
                      &WebPageView::ShowWaitingControls);
 }
 
 void WebPageView::InitDOM(Profile* profile,
                           SiteInstance* site_instance) {
   dom_view()->Init(profile, site_instance);
@@ skipping 49 matching lines @@
       throbber_->GetPreferredSize().width(),
       throbber_->GetPreferredSize().height());
   connecting_label_->SetBounds(
       width() / 2 - connecting_label_->GetPreferredSize().width() / 2,
       y + throbber_->GetPreferredSize().height() + kSpacing,
       connecting_label_->GetPreferredSize().width(),
       connecting_label_->GetPreferredSize().height());
 }
 
 }  // namespace chromeos