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

Unified Diff: views/examples/examples_main.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 | « views/controls/message_box_view.cc ('k') | views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/examples/examples_main.cc
===================================================================
--- views/examples/examples_main.cc (revision 104083)
+++ views/examples/examples_main.cc (working copy)
@@ -103,7 +103,7 @@
examples_.push_back(new WidgetExample(this));
examples_.push_back(new MenuExample(this));
- for (std::vector<ExampleBase*>::const_iterator i(examples_.begin());
+ for(std::vector<ExampleBase*>::const_iterator i(examples_.begin());
i != examples_.end(); ++i)
AddExample(*i);
@@ -111,7 +111,7 @@
}
void ExamplesMain::SetStatus(const std::string& status) {
- status_label_->SetText(UTF8ToUTF16(status));
+ status_label_->SetText(UTF8ToWide(status));
}
void ExamplesMain::AddExample(ExampleBase* example) {
« no previous file with comments | « views/controls/message_box_view.cc ('k') | views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698