Convert string16 to use base namespace.
TBR=sky
Review URL: https://codereview.chromium.org/109233002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239538 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc
index 80f7bd7..6f03d6a 100644
--- a/chrome/browser/extensions/context_menu_matcher.cc
+++ b/chrome/browser/extensions/context_menu_matcher.cc
@@ -27,10 +27,10 @@
filter_(filter) {
}
-void ContextMenuMatcher::AppendExtensionItems(const std::string& extension_id,
- const string16& selection_text,
- int* index)
-{
+void ContextMenuMatcher::AppendExtensionItems(
+ const std::string& extension_id,
+ const base::string16& selection_text,
+ int* index) {
DCHECK_GE(*index, 0);
int max_index =
IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST - IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST;
@@ -61,7 +61,7 @@
menu_model_, index);
} else {
int menu_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST + (*index)++;
- string16 title;
+ base::string16 title;
MenuItem::List submenu_items;
if (items.size() > 1 || items[0]->type() != MenuItem::NORMAL) {
@@ -97,7 +97,7 @@
base::string16 ContextMenuMatcher::GetTopLevelContextMenuTitle(
const std::string& extension_id,
- const string16& selection_text) {
+ const base::string16& selection_text) {
const Extension* extension = NULL;
MenuItem::List items;
bool can_cross_incognito;
@@ -189,7 +189,7 @@
void ContextMenuMatcher::RecursivelyAppendExtensionItems(
const MenuItem::List& items,
bool can_cross_incognito,
- const string16& selection_text,
+ const base::string16& selection_text,
ui::SimpleMenuModel* menu_model,
int* index)
{
@@ -212,7 +212,7 @@
if (menu_id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST)
return;
extension_item_map_[menu_id] = item->id();
- string16 title = item->TitleWithReplacement(selection_text,
+ base::string16 title = item->TitleWithReplacement(selection_text,
kMaxExtensionItemTitleLength);
if (item->type() == MenuItem::NORMAL) {
MenuItem::List children =
