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

Unified Diff: ui/views/examples/widget_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/textfield_example.cc ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/widget_example.cc
diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc
index 0d42a65ae6b35a6582353e23326a89e0d645dffc..c4042b532971b93ec15b694fc6913a3148337711 100644
--- a/ui/views/examples/widget_example.cc
+++ b/ui/views/examples/widget_example.cc
@@ -22,7 +22,7 @@ class DialogExample : public DialogDelegateView {
public:
DialogExample();
virtual ~DialogExample();
- virtual string16 GetWindowTitle() const OVERRIDE;
+ virtual base::string16 GetWindowTitle() const OVERRIDE;
virtual View* CreateExtraView() OVERRIDE;
virtual View* CreateTitlebarExtraView() OVERRIDE;
virtual View* CreateFootnoteView() OVERRIDE;
@@ -36,7 +36,7 @@ DialogExample::DialogExample() {
DialogExample::~DialogExample() {}
-string16 DialogExample::GetWindowTitle() const {
+base::string16 DialogExample::GetWindowTitle() const {
return ASCIIToUTF16("Dialog Widget Example");
}
« no previous file with comments | « ui/views/examples/textfield_example.cc ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698