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

Unified Diff: ui/views/examples/tabbed_pane_example.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 | « ui/views/examples/multiline_example.cc ('k') | ui/views/examples/table_example.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/tabbed_pane_example.cc
diff --git a/ui/views/examples/tabbed_pane_example.cc b/ui/views/examples/tabbed_pane_example.cc
index f0f6691ef8782ce4961cc187ddb9d1f89df9ec39..9c4bdde9f9cf6a105b4a953b91e883aeabd8fe7d 100644
--- a/ui/views/examples/tabbed_pane_example.cc
+++ b/ui/views/examples/tabbed_pane_example.cc
@@ -57,7 +57,7 @@ void TabbedPaneExample::ButtonPressed(Button* sender, const ui::Event& event) {
if (sender == add_) {
AddButton("Added");
} else if (sender == add_at_) {
- const string16 label = ASCIIToUTF16("Added at 1");
+ const base::string16 label = ASCIIToUTF16("Added at 1");
tabbed_pane_->AddTabAtIndex(1, label, new LabelButton(NULL, label));
} else if (sender == select_at_) {
if (tabbed_pane_->GetTabCount() > 1)
« no previous file with comments | « ui/views/examples/multiline_example.cc ('k') | ui/views/examples/table_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698