summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/file_manager/open_util.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 23:12:15 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 23:12:15 +0000
commitcc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (patch)
tree9a010de6ab6210b43e4bc7cfa187ef3a80312a0b /chrome/browser/chromeos/file_manager/open_util.cc
parent8af3b22a0f64133ba32f4deaedc6540060520ff7 (diff)
downloadchromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.zip
chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.gz
chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.bz2
Revert 242455 "Revert 242449 "Update some uses of UTF conversion..."
> Revert 242449 "Update some uses of UTF conversions in chrome/bro..." > > > Update some uses of UTF conversions in chrome/browser to use the base:: namespace. > > > > BUG=330556 > > TEST=no change > > TBR=ben@chromium.org > > > > Review URL: https://codereview.chromium.org/120943002 > > TBR=avi@chromium.org > > Review URL: https://codereview.chromium.org/103853007 TBR=avi@chromium.org Review URL: https://codereview.chromium.org/120993002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/file_manager/open_util.cc')
-rw-r--r--chrome/browser/chromeos/file_manager/open_util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/file_manager/open_util.cc b/chrome/browser/chromeos/file_manager/open_util.cc
index 825f56a..86952cb 100644
--- a/chrome/browser/chromeos/file_manager/open_util.cc
+++ b/chrome/browser/chromeos/file_manager/open_util.cc
@@ -58,7 +58,7 @@ void ShowWarningMessageBox(Profile* profile, const base::FilePath& file_path) {
browser ? browser->window()->GetNativeWindow() : NULL,
l10n_util::GetStringFUTF16(
IDS_FILE_BROWSER_ERROR_VIEWING_FILE_TITLE,
- UTF8ToUTF16(file_path.BaseName().value())),
+ base::UTF8ToUTF16(file_path.BaseName().value())),
l10n_util::GetStringUTF16(IDS_FILE_BROWSER_ERROR_VIEWING_FILE),
chrome::MESSAGE_BOX_TYPE_WARNING);
}