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

Unified Diff: content/shell/browser/shell_javascript_dialog_manager.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « content/shell/browser/shell_javascript_dialog_gtk.cc ('k') | content/shell/browser/shell_login_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_javascript_dialog_manager.cc
diff --git a/content/shell/browser/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc
index 6ac7243bfb5b8ba71aa2b1b18b4df1063f05c1f0..7f3b678ea7f47784e6e1c16dab09cd4e828e2016 100644
--- a/content/shell/browser/shell_javascript_dialog_manager.cc
+++ b/content/shell/browser/shell_javascript_dialog_manager.cc
@@ -53,7 +53,7 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(
}
base::string16 new_message_text = net::FormatUrl(origin_url, accept_lang) +
- ASCIIToUTF16("\n\n") +
+ base::ASCIIToUTF16("\n\n") +
message_text;
gfx::NativeWindow parent_window =
web_contents->GetView()->GetTopLevelNativeWindow();
@@ -97,7 +97,7 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
base::string16 new_message_text =
message_text +
- ASCIIToUTF16("\n\nIs it OK to leave/reload this page?");
+ base::ASCIIToUTF16("\n\nIs it OK to leave/reload this page?");
gfx::NativeWindow parent_window =
web_contents->GetView()->GetTopLevelNativeWindow();
« no previous file with comments | « content/shell/browser/shell_javascript_dialog_gtk.cc ('k') | content/shell/browser/shell_login_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698