summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_message_bubble_controller.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 20:54:29 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 20:54:29 +0000
commitfb94f39dc9252bcc88825f0de1aaa0850c5c7c73 (patch)
treec998c9a5ee8404efc652b5218c160eccb65f2e44 /chrome/browser/extensions/extension_message_bubble_controller.cc
parent6778feddfd9451088649a5b42de79d032832e4ee (diff)
downloadchromium_src-fb94f39dc9252bcc88825f0de1aaa0850c5c7c73.zip
chromium_src-fb94f39dc9252bcc88825f0de1aaa0850c5c7c73.tar.gz
chromium_src-fb94f39dc9252bcc88825f0de1aaa0850c5c7c73.tar.bz2
Revert 242450 "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/120953002 TBR=avi@chromium.org Review URL: https://codereview.chromium.org/107423005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_message_bubble_controller.cc')
-rw-r--r--chrome/browser/extensions/extension_message_bubble_controller.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc
index 895dc78..1cf7e4f 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller.cc
@@ -55,10 +55,10 @@ ExtensionMessageBubbleController::GetExtensionList() {
it != list->end(); ++it) {
const Extension* extension = service_->GetInstalledExtension(*it);
if (extension) {
- return_value.push_back(base::UTF8ToUTF16(extension->name()));
+ return_value.push_back(UTF8ToUTF16(extension->name()));
} else {
return_value.push_back(
- base::ASCIIToUTF16(std::string("(unknown name) ") + *it));
+ ASCIIToUTF16(std::string("(unknown name) ") + *it));
// TODO(finnur): Add this as a string to the grd, for next milestone.
}
}