From dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 6 Dec 2013 23:58:45 +0000 Subject: Use base namespace for string16 in chrome/browser. This converts 200 more files. TBR=sky Review URL: https://codereview.chromium.org/108353004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239278 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/toolbar/encoding_menu_controller.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/ui/toolbar/encoding_menu_controller.cc') diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc index ddaedb7..789abbb 100644 --- a/chrome/browser/ui/toolbar/encoding_menu_controller.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller.cc @@ -105,7 +105,7 @@ void EncodingMenuController::GetEncodingMenuItems(Profile* profile, EncodingMenuItemList* menu_items) { DCHECK(menu_items); - EncodingMenuItem separator(0, string16()); + EncodingMenuItem separator(0, base::string16()); menu_items->clear(); menu_items->push_back( @@ -130,7 +130,7 @@ void EncodingMenuController::GetEncodingMenuItems(Profile* profile, std::vector::const_iterator it; for (it = encodings->begin(); it != encodings->end(); ++it) { if (it->encoding_id) { - string16 encoding = it->encoding_display_name; + base::string16 encoding = it->encoding_display_name; base::i18n::AdjustStringForLocaleDirection(&encoding); menu_items->push_back(EncodingMenuItem(it->encoding_id, encoding)); } else { -- cgit v1.1