Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1195)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/web_page_view.cc

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/username_view.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/web_page_view.cc
===================================================================
--- chrome/browser/chromeos/login/web_page_view.cc (revision 104083)
+++ chrome/browser/chromeos/login/web_page_view.cc (working copy)
@@ -117,11 +117,11 @@
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),
« no previous file with comments | « chrome/browser/chromeos/login/username_view.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698