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

Unified Diff: ui/views/test/child_modal_window.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/test/child_modal_window.h ('k') | ui/views/test/test_views_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/child_modal_window.cc
diff --git a/ui/views/test/child_modal_window.cc b/ui/views/test/child_modal_window.cc
index 510275c509a4ee7c9b936adb28d2028216894b16..a7eda41708bc75106794568e20af0c501dd242b3 100644
--- a/ui/views/test/child_modal_window.cc
+++ b/ui/views/test/child_modal_window.cc
@@ -65,7 +65,7 @@ class ChildModalWindow : public WidgetDelegateView {
// Overridden from WidgetDelegate:
virtual View* GetContentsView() OVERRIDE;
- virtual string16 GetWindowTitle() const OVERRIDE;
+ virtual base::string16 GetWindowTitle() const OVERRIDE;
virtual bool CanResize() const OVERRIDE;
virtual ui::ModalType GetModalType() const OVERRIDE;
@@ -95,7 +95,7 @@ View* ChildModalWindow::GetContentsView() {
return this;
}
-string16 ChildModalWindow::GetWindowTitle() const {
+base::string16 ChildModalWindow::GetWindowTitle() const {
return ASCIIToUTF16("Examples: Child Modal Window");
}
@@ -159,7 +159,7 @@ View* ChildModalParent::GetContentsView() {
return this;
}
-string16 ChildModalParent::GetWindowTitle() const {
+base::string16 ChildModalParent::GetWindowTitle() const {
return ASCIIToUTF16("Examples: Child Modal Parent");
}
« no previous file with comments | « ui/views/test/child_modal_window.h ('k') | ui/views/test/test_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698