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

Unified Diff: chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc

Issue 112913004: Update some uses of UTF conversions in chrome/browser 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 | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
index c59f3ddc7535db9dc7270767356111e973fe8e06..34ffa7c26202a950e89a572679247e2497fd982c 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
@@ -209,7 +209,8 @@ void ChromeJavaScriptDialogManager::RunBeforeUnloadDialog(
const base::string16 footer = l10n_util::GetStringUTF16(is_reload ?
IDS_BEFORERELOAD_MESSAGEBOX_FOOTER : IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER);
- base::string16 full_message = message_text + ASCIIToUTF16("\n\n") + footer;
+ base::string16 full_message =
+ message_text + base::ASCIIToUTF16("\n\n") + footer;
const Extension* extension = GetExtensionForWebContents(web_contents);
if (extension)
@@ -271,7 +272,7 @@ base::string16 ChromeJavaScriptDialogManager::GetTitle(
const Extension* extension = GetExtensionForWebContents(web_contents);
if (extension)
- return UTF8ToUTF16(extension->name());
+ return base::UTF8ToUTF16(extension->name());
// Otherwise, return the formatted URL.
// In this case, force URL to have LTR directionality.
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698