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

Unified Diff: ui/views/controls/webview/web_dialog_view.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/controls/webview/web_dialog_view.h ('k') | ui/views/corewm/tooltip.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/webview/web_dialog_view.cc
diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
index 7f88f022f555aded4b77ba86ed6897e59fcc02f9..4fed9cfe8e2cdc4fd5279b56b92ef4db904b2bb7 100644
--- a/ui/views/controls/webview/web_dialog_view.cc
+++ b/ui/views/controls/webview/web_dialog_view.cc
@@ -135,10 +135,10 @@ ui::ModalType WebDialogView::GetModalType() const {
return GetDialogModalType();
}
-string16 WebDialogView::GetWindowTitle() const {
+base::string16 WebDialogView::GetWindowTitle() const {
if (delegate_)
return delegate_->GetDialogTitle();
- return string16();
+ return base::string16();
}
std::string WebDialogView::GetWindowName() const {
@@ -188,7 +188,7 @@ ui::ModalType WebDialogView::GetDialogModalType() const {
return ui::MODAL_TYPE_NONE;
}
-string16 WebDialogView::GetDialogTitle() const {
+base::string16 WebDialogView::GetDialogTitle() const {
return GetWindowTitle();
}
« no previous file with comments | « ui/views/controls/webview/web_dialog_view.h ('k') | ui/views/corewm/tooltip.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698